diff --git a/Manifest b/Manifest
index 5604a848e4e0..86ca3a06408b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29550 BLAKE2B f3e24edafd29a3620fae40fa0a6a7b65d02edc4bf1d27dcec6fd5abcd57250e6d0f29e7d751cfe6718406ac2a0829554c2ccfa4070b18e272800c4050afabea4 SHA512 40a948da701a7e8ae918f252ebd7295a89c4f3b44d9d0c75b4c99ddf1ab3e17e0cc557d6dbf0071fc710fe93916e79e3388a05bfa571670ebda5e296fb9274f2
-TIMESTAMP 2022-07-08T11:39:44Z
+MANIFEST Manifest.files.gz 29570 BLAKE2B e0a93bc6e5b2f9940daf70353e6f6020648a48aba8dd1059e40a3df74318117165b9afab72de0534ebe93c8968a554b074e16b31b3533571b1b83192aec41bae SHA512 c029a39111ff4ab720b4069282de73c07fa8ea9cd50647607289f27688826ed92f6544082e82e5eb2f43390e4d59a64a0bd9291c6e65008d0f784d1d22e97209
+TIMESTAMP 2022-07-10T14:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLIF4BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLK5LRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAQqg/+NrxR87KLe3jYiRiIsYDP8kxHMEytc44g76vwTVrvWKaY+HSLN+JjnqwK
-0tW6RptqFbQ/JxZa6yqqG6ixYlvVYxZ9TlcQ6Kf9bBakEUnYAXgKTtFc+dviRs0t
-rZJvZrZ9ZY9mslIh/eOD6bceN3Pk5H/5GyWM4HCQnTqPzPnDGtTixRvtHFNzk52N
-Nqdnq4RNXVYX1pO01vupVo7K5h1BRH182BKRGQ04Zqq3ShTER9Z7hhs+sWx1BVWY
-O+o4FVuyJKPh1pLwa0xGEMec0sdyQ0dX557ri8ki06uuXl+2cO75SsQvzGpG7xp3
-yX3B1JoxRr8vMvsCvILefbjENAWBDIRBj+R9Xv5/U38dSajWkymFhmWJYk+0Kbsu
-vBdTX24u//psi5ZA+2AlRBMg1nSukkPZtAJrxpE9qqSrgVfnuSr+JHU1d7tG7Lsc
-qmbuFCWt2tAI6yUUsXRSNw0/viVBr+EujMDIgFLBfmL0BKOTOqEGkF2n7GPgWHI9
-3D3uZ9D+/5eSxENEmSaj7J+JIDpoNjlrxW21viW2tB0OaiDl/EGKZ2J/V0NNkpcX
-DoX9RuyM3QeV6/ZN7IwFWhWJkbAHtTs1m+f5GRYWaJ+51l+dBTL6JNXWTkHg6/qd
-ufWibRWW60HEjwhPjxw/C2ElACSQXgUp1PDPZzoT874dk4rQD8A=
-=UCRx
+klB+hw//YAJABFmx+MW6BxSawFI9bjphd+R6OA8DxXrEAROPXjg/shDEnRl/4zLd
+8xSnGY14NHPt39irGdPbCTilZttiPDUAZFf4S251y8ckRhhk6tHocqI/BS7FFXQ7
+yuD4IXo37Dl98ej9zP7SWtsmVMGT23poVnKzLSX1LimNClfn7sHPEKT+1vcFtODx
+Scp3D9LGdfDdzGc3+Y1SVPce9N52e8rPljZzLJSEjJHUYzUjCUONBe3TEuHYGvqP
+SVUiE8C1CRc/hb8fE0kayIpDUES5RRRZBZVt7ueemF6TTGDLPUd7vlEa9/PF8KVt
+pzUS8xEQKgLir/OpBFWO1yUkVOTlpOV6GBMYo+DhDMtYGvdoRRtg0F0uTi7Pcj8i
+98nV2pNbF6gGjEicZ+IgeTOyJs+oNZfhH9w472fIW6IDPkBC5C0ut+ku04//2mLO
+aNZguPEWUGJcsAnYS5RzCPQr4TeIEPuoKySSju0OgC5Uk+j3046uwWw0RI1VgwC+
+f3NpGyW/4IJZP569iVRud+MmSttS1lHWOHMvG/pH1BOkjXlLQcdqY1gABdYjRU/b
+N69UAjMoDe0ZHrE9IOG6ama8JEItxHb49bUqaPaV9AFou+yC+vX3pmtwSqZSXg/B
+bLVKTEq1A7wDAhaZ2+EgZHyye20uMEKhRaRu97OtilDGy7jKBFM=
+=Gj35
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3d0d15d7390e..9c825ed1e979 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 0a4a73e1d083..436f14e1dcdf 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/synapse/Manifest b/acct-group/synapse/Manifest
new file mode 100644
index 000000000000..66398db05d5f
--- /dev/null
+++ b/acct-group/synapse/Manifest
@@ -0,0 +1,2 @@
+EBUILD synapse-0.ebuild 187 BLAKE2B 5c4f0280e094c40338c44499f56faf75baa25822270b4f125428472c418b577eb081e6f8cf05b30c6d804efed77c1fa5986d857a1995497da6864b67265762d2 SHA512 e165bfe799cf162ed76cdc6083f53c266fd01eaff2ef7f6ecc7f5cd369cc51412a9cf3d352d81348690a59da472b241ee81a2537d87ab1c0479cf620a9f2ac8f
+MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-group/synapse/metadata.xml b/acct-group/synapse/metadata.xml
new file mode 100644
index 000000000000..c74515d20dbe
--- /dev/null
+++ b/acct-group/synapse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+</pkgmetadata>
diff --git a/profiles/arch/mips/mips64/n32/package.mask b/acct-group/synapse/synapse-0.ebuild
similarity index 53%
rename from profiles/arch/mips/mips64/n32/package.mask
rename to acct-group/synapse/synapse-0.ebuild
index fa019d7c4fd8..0f7e576bb55a 100644
--- a/profiles/arch/mips/mips64/n32/package.mask
+++ b/acct-group/synapse/synapse-0.ebuild
@@ -1,5 +1,9 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# bug 850151
-dev-lang/python:3.11
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/synapse"
+ACCT_GROUP_ID=519
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 7a86d3966a76..41bfb78864c0 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/amule/Manifest b/acct-user/amule/Manifest
index 5f8486a10068..5798d9af6fe2 100644
--- a/acct-user/amule/Manifest
+++ b/acct-user/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r1.ebuild 228 BLAKE2B 9dfc4f7a80946e66b059a43c5a77e20c0f9fcb587f6c972525e28389bfed66bdc26cf8a1ddccd65f63977f7f8d5dbf706f4f06d9a49506ae2a84a47d2e502c85 SHA512 e0486bccf72cc101beda4fcd4b743381b74699a6b1d986e215067a46e73692ea47fe5990ca8a8562ba5a71dd11c74a4bbaa867f9634ef0cd88fef889c8ce5faf
+EBUILD amule-0-r2.ebuild 270 BLAKE2B 4478c146afce117ef961bea8f3c4edbfe3d5773cb4956e13544c2ed5dee6ed2ecfc238071a6b2a548e199d1682baafe57e472403ba4e0a4103119a502ce588f6 SHA512 8a1eecc151a395002c359c4b9f8279f73fac3a9780117c540937ea69f2ee0a97a2c412d9db23dde33026362560dfb13aed285d0b57064135240509647226a0d7
 MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
diff --git a/acct-user/amule/amule-0-r1.ebuild b/acct-user/amule/amule-0-r2.ebuild
similarity index 53%
rename from acct-user/amule/amule-0-r1.ebuild
rename to acct-user/amule/amule-0-r2.ebuild
index 58d59281ccb4..545f68eb371a 100644
--- a/acct-user/amule/amule-0-r1.ebuild
+++ b/acct-user/amule/amule-0-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-user
 
 DESCRIPTION="User for net-p2p/amule"
-ACCT_USER_ID=468
-ACCT_USER_GROUPS=( amule )
+
+ACCT_USER_GROUPS=( "amule" )
+ACCT_USER_HOME="/var/lib/amule"
+ACCT_USER_ID="468"
 
 acct-user_add_deps
diff --git a/acct-user/synapse/Manifest b/acct-user/synapse/Manifest
new file mode 100644
index 000000000000..a325a8648fe3
--- /dev/null
+++ b/acct-user/synapse/Manifest
@@ -0,0 +1,2 @@
+EBUILD synapse-0.ebuild 233 BLAKE2B 643656e5c2bc4531c4417731218e3727955662961421a7391176065c14ac6e4a23eb75afbf021144e0fe19672ceff35706608ca1ae8b9d06316dd015b9ef37bb SHA512 5025226fd564c361c32bb97dd6c003f24b98a8de2419433cf40e5fd8b5c1c00abd02abba24d247f8786788af9dfaa2ae3832e0ad4d673c2591c299514927b75e
+MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/acct-user/synapse/metadata.xml b/acct-user/synapse/metadata.xml
new file mode 100644
index 000000000000..c74515d20dbe
--- /dev/null
+++ b/acct-user/synapse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+</pkgmetadata>
diff --git a/acct-user/synapse/synapse-0.ebuild b/acct-user/synapse/synapse-0.ebuild
new file mode 100644
index 000000000000..0fb650ac5752
--- /dev/null
+++ b/acct-user/synapse/synapse-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/synapse"
+ACCT_USER_ID=519
+ACCT_USER_GROUPS=( synapse )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8dfc3f7b2740..ed0aa6ab3c19 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 15bb822c49f7..f3dda3d5494a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,17 +1,7 @@
-DIST aws-cli-1.25.12.gh.tar.gz 2224456 BLAKE2B d6425983b09fc3942727108e188e184f48399388704ada03df1d65ddb9adffc9597a217b863766a862e96b59c03fdb3202e694289b54ee9298fe7e547639ecc3 SHA512 a77e0d082a8dacecadbd2fa6cc1143fa5148e075894565fe9a552e9d1a27fd068c72ae57eb5c628129bb024267111b76722cf2c40dc9f719db8d96232302b918
 DIST aws-cli-1.25.17.gh.tar.gz 2226115 BLAKE2B d07a9c7a8e13019fd728489d27465497ba31f53087ef09e5f816792267bcb58158fa0a7f71fc499d3e343b5b3a0da45cc3632f8c69345b8cd93ebc735f645672 SHA512 1a7f90e28d6702f9e73fe3a93e0d91e2c4ea3d93574f21a3ecde1148445fe6b5f98f217e2e61a1cbba50a07590f0ab0abd00390fb04cbb3db74dfff698224997
-DIST aws-cli-1.25.20.gh.tar.gz 2227422 BLAKE2B 7dfeb6266578fc61a4fa54f39bbaaabcc8c53fc133f1993669a3cda0398fa67a6e54f122b6a103474a0b6a31c7a259237cf4a759995eab727d8f103a8649163a SHA512 0179487b9dbc9864eeb066e9f4f30c67b17dec589c5860b476cbc7798d1b163080d7d3caeae18367afdd89d299f508bfbbb2150d4795aaa85efdeb5b61030663
-DIST aws-cli-1.25.21.gh.tar.gz 2228274 BLAKE2B 3246bcc1607fa7a43cb081192176345c189b8e19c197e22f27396d3dd72f7e55436820010f9245375ddbf4cfc24f13d2fc47864ad34a5dca1529669e91b6bff1 SHA512 26a97d632206016cfba2a8a51949ad623677a04a6582d1f7f28191c02adb39bf8f4b42e22796c3c97c29ae2dc36007803fc25f442111a67f93f3cc8880e50759
 DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9dca3e443a120ff6ab3475b0777ca5e50c17a3c30641c57df1df63cc065fc0316b1e847b695bdfbe49a0a5b330912a74 SHA512 328303792a75c9f44c7e37e825ffb81aa2a071d4ae18b21c31f2c9abc5e0ae8f3ec079725847cd731d4cc49b5064a0244129176789f4ce0865e6d8cae0dda1e8
-DIST aws-cli-1.25.23.gh.tar.gz 2229364 BLAKE2B 1610ceba16cc6555b333d1f2869f4c8667a7aecfb28ac21f46ebd1ca9a3f26da78d1f84816a7ec6c279273c5d17ab97e1963a73499c5a648571da0386f715b88 SHA512 8cc030c386b9a3d58ea2ff41d9a8da30f126707db1b9e8397ee676f3f9f4d0c8f74aa840307ba6664508d47e2f73d7fb3fe5090b7d117aab8d8b47b1b3a191eb
-DIST aws-cli-1.25.24.gh.tar.gz 2229473 BLAKE2B 2937ca1016052732ff382b70c5a479250a139a9c556f1cf40a2903dac35f8fbe89575b1cd3bf787c23a0cb70ebe87fd7cf3952ce9eef08347c439e30a0efd3dd SHA512 7a0c7b3ac9cc9cedefe72ce9d7004afa5cf4b5cb25826153452fd83fdef89970d286e63c1e47f699b9d8bbe2cd39f7079a2154cd3d1064ecbd6d8b6ab244c9a2
-DIST aws-cli-1.25.25.gh.tar.gz 2230412 BLAKE2B 3dc6ab33083e0ff276c2f053675af7ad56287864d6112e8ff03270807bd68d8959753a20fb8b9569dce10c20cc1c6bfd4730b95139f95b911f30992eb38caedc SHA512 fb90e9132e8911acbc984154f739b9bdba77a805b0de0419ff500634af9428e88ff6220d2fc09b301f6af510559bfbec88ec6ec4c56e81e049145f9b43da6cfd
-EBUILD awscli-1.25.12-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
-EBUILD awscli-1.25.17-r1.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.20.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.21.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
+EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.23.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.24.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.25.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.12-r1.ebuild b/app-admin/awscli/awscli-1.25.12-r1.ebuild
deleted file mode 100644
index f241876330bb..000000000000
--- a/app-admin/awscli/awscli-1.25.12-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.17-r1.ebuild b/app-admin/awscli/awscli-1.25.17-r1.ebuild
index 9f176fa05cc8..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.17-r1.ebuild
+++ b/app-admin/awscli/awscli-1.25.17-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.25.21.ebuild b/app-admin/awscli/awscli-1.25.21.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.21.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.23.ebuild b/app-admin/awscli/awscli-1.25.23.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.23.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.24.ebuild b/app-admin/awscli/awscli-1.25.24.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.24.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.25.ebuild b/app-admin/awscli/awscli-1.25.25.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.25.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.20.ebuild b/app-admin/awscli/awscli-1.25.26.ebuild
similarity index 100%
rename from app-admin/awscli/awscli-1.25.20.ebuild
rename to app-admin/awscli/awscli-1.25.26.ebuild
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index 8bfe5206d50b..e1f9c9859ac0 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1,6 +1,8 @@
 DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
 DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08 SHA512 a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71
+DIST doctl-1.78.0.tar.gz 5658172 BLAKE2B 3213219b1cfbc395c742a59a6bee1c6232f222455ac126de9ce51470a56ebaa9680de4d332cd31580a7ddb9f748b19a8abadef17ff6ea4265dffc2c42b1bb16d SHA512 193fe775885c78312eb6ba14bd34d109ee31acf41cfe68dbacbf6ab19864509b774c658aecf7a61d470598ca89829a6737ea6796eb970b3075d8f37aef747dbe
 EBUILD doctl-1.76.2.ebuild 1192 BLAKE2B 2b2e5e62493c6f2469deeb48a1c799e8ba4b9ee9b756b0ba44c1b9cd5af8162d7c8c56e65ae65e3311055ce00e5fd8094132a012d3bf3fd624c9a123f796bd1f SHA512 333c3fe715ae2b0c289401ca22f233722a7e4d3da4c1ec5e137c0ebf5c78717d44aef07067ec8ec05864dd4f6edf5d586842a58cbde7be4b4e30d62a5403107c
 EBUILD doctl-1.77.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-1.78.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
 EBUILD doctl-9999.ebuild 1117 BLAKE2B db665b93fd6a9ff473a35f80b4d04e8474cea1c93d293f1731c87562fc65e03228569b2d0929b7fc6b1326ef4e2982d524a364276b4be537b87aee5cbcf8d3d0 SHA512 cd6a84398b1c031240b9faa0615388117215f42c740b520256a2e4b6748a59d2c7457e0389cf84fe945d483663b63ba335066cee57887783fde577e3bd196464
 MISC metadata.xml 670 BLAKE2B 5ee85d9c94a3bc5bf5a159089a11d22db8eb1923d0e713fd45ba4f76f154e17784fded0819aa2a359d2c582d96ca0db99ae80a01bb62843d136b45729b87407d SHA512 d48173ace378646dcad5eb5eb7025436432291ef03f89847e874c4cae7afebcd3c05549553543890581dccc8a7ab2808a6bab7fab6c1f315dcef7300897472d7
diff --git a/app-admin/doctl/doctl-1.78.0.ebuild b/app-admin/doctl/doctl-1.78.0.ebuild
new file mode 100644
index 000000000000..3f5680240a83
--- /dev/null
+++ b/app-admin/doctl/doctl-1.78.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 edo go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
+		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
+		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
+		-X github.com/digitalocean/doctl.Label=release"
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
+
+	local completion
+	for completion in bash zsh fish ; do
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
+	done
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 7ee02579849a..5767fb0abe2a 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,7 +1,5 @@
-DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
 DIST needrestart-3.6.tar.gz 71159 BLAKE2B 76994ef0e77a4db0532dca2e17990097b2314f912fc3c32e67643eca7c44fff9611a42b49abd55f959a0e959d6ea69cfef36ad9008c86debfd125b64bdc673b5 SHA512 5c0f2f427c93e6f621fc1727f6abf42651e184e168b3f720708ac73b425bc7dfb94622c6cc2afad1161e3ffbfd36500eb99c375f2f5a525c9cd10d7142f1e365
-EBUILD needrestart-3.3.ebuild 837 BLAKE2B 96162645388eff943edf52e9af487eecb8123e1ccf101dd9e4ae3564ee4f8ceca7d673f7a26679171d12c69f66e39ebb4536753c32acc4f5d0bc5ee179e75c0a SHA512 9e900a39d78fe2fba7d182ed0698259eca04df70b00d8eb5d6a28ef3af0b3da9c51f39a93cbc2b4b4d82638582b04dbef33a26c553ee8bbe7db9381b2cd956d3
 EBUILD needrestart-3.5.ebuild 913 BLAKE2B b7526899199daa72bb6d0c5d323dffc48bae329d6469f64c20e2a427b54508c03eed410d366aa0b78e666ff8a39095d48869e59a9e573927d564c5eb20c42f1b SHA512 6cd43d37250a15db77e143ee371f69a23b0aac8f2c8828f27cbb3b270cff20717262dd3cd0fc84f32c1d09d076efd6635b1a4e2e13f9ce23753575db821cfdd6
 EBUILD needrestart-3.6.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
 EBUILD needrestart-9999.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
diff --git a/app-admin/needrestart/needrestart-3.3.ebuild b/app-admin/needrestart/needrestart-3.3.ebuild
deleted file mode 100644
index 576521c08c4f..000000000000
--- a/app-admin/needrestart/needrestart-3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Restart daemons after library updates"
-HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
-
-SLOT="0"
-LICENSE="GPL-2+"
-
-RDEPEND="
-	>=sys-apps/sed-4.2.2
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Module-Find
-	dev-perl/Module-ScanDeps
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/TermReadKey
-	sys-apps/init-system-helpers
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_install() {
-	default
-	doman man/*.1
-	dodoc -r ex
-}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 184841444092..515dbc9bf6a6 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,5 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
+EBUILD pwgen-2.08-r1.ebuild 605 BLAKE2B f10c824ae577bb71cf0d394ceebfad72eb9f46ea41c435d4409f3fec13fe81d05a3f5de94b522259d29358f3770a5466e58991ba408338dea0cdb5dd914c49bd SHA512 4d5281965c65581155fa120b2d3c56321fb43d93d16dc8e26429ab318dd05b94e67023ff4f1aa3f88831d79ae3b316da543e641561f7da3e943db27452a2ce53
 EBUILD pwgen-2.08.ebuild 597 BLAKE2B 3ddd679af075d48ad52db3c370fc3dbe33cc45f5d315bc803ad860c921ef231d7279e399d257b391baea63d0351cb787d2ee5ba5c6ae55b85d90c184be521431 SHA512 d9edc8ecc0873444a53632d1faf7cda6e72661f91a8eedbda33253a172cb0f180548664d3e236a82c302cae6317c7f081ad81fa42a91fdc6bb684bd6e583ce5a
 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9
diff --git a/app-admin/pwgen/pwgen-2.08-r1.ebuild b/app-admin/pwgen/pwgen-2.08-r1.ebuild
new file mode 100644
index 000000000000..c9004c9dec93
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+	default
+
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 668a171d4a21..88c7c80f4b17 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 3c12c15af8ae..2941f13284cc 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,4 +1,5 @@
+AUX unace-2.5-includes.patch 269 BLAKE2B e4a0d3d03c392b3ff7af055d0a2ee8fe182cd5bde54e2868606bd78cc5a0a801b79f795e0cbfbf0d771b7e9dec5679daec3681b83563b94ec5081ea9523a129e SHA512 7986366dde0c1459b184fd81ffcd89b0a6469198c28dbcbe391f38596022c94a45103a8a573e3434b59d17e9d361bc0d70f047778361fa74ea15299ec31975b5
 DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
-EBUILD unace-2.5-r5.ebuild 677 BLAKE2B d6e46d2e819fa3d5a13c708cbceadd3def0bb3ded130420767e6411e5cd3853fc847191f35a9f0ea198d1a3e6a5dd56a8d80128223a63bbc2bc51f3384cbcdda SHA512 33572c57f7b86998e043fff8b73449d08ca340e28e47766c701672285d08827d8ae77e473d8733903a4acb71732db7904990eeb999baa6301a656df02b3b95dc
+EBUILD unace-2.5-r6.ebuild 706 BLAKE2B 3f5fb8dbab50636437adb19dd9bb8611a8faf7d316efce5a3edfe7d86027533f05356b68f41aa12330c1a9cb23e9eaa3655c6b095e5a47379f1d221534944994 SHA512 aa049a1e2670927c8418a5d91878f256c57a0101c51938f32f333827f3a7948942284b1f563bcdd3bc7d5dc3e781cccb62a43088d280690fca0dce6ca7f2898a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-arch/unace/files/unace-2.5-includes.patch b/app-arch/unace/files/unace-2.5-includes.patch
new file mode 100644
index 000000000000..ca272a185041
--- /dev/null
+++ b/app-arch/unace/files/unace-2.5-includes.patch
@@ -0,0 +1,10 @@
+--- a/source/base/all/uninorm/unincore.c
++++ b/source/base/all/uninorm/unincore.c
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include "base/all/includes.h" /* BASE_LFN_MAXLEN */
+ #include "unidata.h"
++#include "unincore.h"
+ 
+ /* Hangul constants */
+ #define SBase  0xAC00
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r6.ebuild
similarity index 70%
rename from app-arch/unace/unace-2.5-r5.ebuild
rename to app-arch/unace/unace-2.5-r6.ebuild
index fd5a75cbe2f2..f8dbaf5919a5 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r6.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs
 
 DEB_VER="9"
+
 DESCRIPTION="ACE unarchiver"
 HOMEPAGE="http://www.winace.com/"
-SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
 	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.debian.tar.xz"
 
 LICENSE="freedist"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE=""
 
-PATCHES=( "${WORKDIR}"/debian/patches/ )
+PATCHES=(
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}"/${P}-includes.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index e81fc6a832d5..8599385dacff 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,4 @@
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
-EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
+EBUILD unadf-0.7.12-r2.ebuild 630 BLAKE2B e4e3eb425272a0d5eb33643c29262b4fc270d7f8b1fc38b258254ad64b6621c092cfbd6490a64f4670a3e77032a4393694a613f0a67ca25f412e2353aa30cf4c SHA512 7c905dde35cde5cda520aa3afafaa4ed5dc3a77873d5d608a22d9c6d04953ec88d1810c267caf211a9ee385e6b09b050f08690d1731a0dc04220dd200565134c
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild
similarity index 76%
rename from app-arch/unadf/unadf-0.7.12-r1.ebuild
rename to app-arch/unadf/unadf-0.7.12-r2.ebuild
index fb1aed5c2ad7..2c73f6a4a614 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -10,13 +10,12 @@ MY_PN="adflib"
 DESCRIPTION="Extract files from Amiga adf disk images"
 HOMEPAGE="http://lclevy.free.fr/adflib/"
 SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
 
 src_prepare() {
@@ -24,11 +23,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 02bbc65cd739..be58d243f0be 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,3 +1,3 @@
 DIST zpaq715.zip 1000646 BLAKE2B 3ecc69af7c14ca43643d54feac54647c82ac25e0212fc7f6e60821b76ba1976a2b2ccbf07e030ab6518c8643b452309d622cbea602fc4fe8798af7e4ecb2b027 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265
-EBUILD zpaq-7.15.ebuild 1031 BLAKE2B 62d4893a1d53bda01e99877d8fe92442ecc0476f422d9bf799c05717c16bf8dc0f42e5635075a236e966014369dc6aa321e188292e4061725b1ced99652d555a SHA512 bc1e2f1e7da4e74bb91cbf700b4e81aadf4c9534f28c034176bd0c4904decf0489d62ba0969b5f1d964d1a8432632d1eb5c8989d5d44095f70a3919cc308dad3
+EBUILD zpaq-7.15-r1.ebuild 1032 BLAKE2B 57dd4e8f9b18daa44a7ab8c473e1bc84230a9824c733ca0e4f92cd83d9069b967ff4f449d882f7d8a1b53101b8e3d6dd399d00928e6b1c78b761290da2872c98 SHA512 04bcc6901531a9d6fa5781378a60800d8ff5b7608106e0a1991a2e222958abd5c1710f202a494c722dd1ace6eb3cf4460435e00f4c8a119b3da456071acfa815
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/zpaq/zpaq-7.15.ebuild b/app-arch/zpaq/zpaq-7.15-r1.ebuild
similarity index 87%
rename from app-arch/zpaq/zpaq-7.15.ebuild
rename to app-arch/zpaq/zpaq-7.15-r1.ebuild
index aabf4cdca479..cd79e48be432 100644
--- a/app-arch/zpaq/zpaq-7.15.ebuild
+++ b/app-arch/zpaq/zpaq-7.15-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic pax-utils toolchain-funcs
 
-MY_P=${PN}${PV/./}
+MY_P="${PN}${PV/./}"
+
 DESCRIPTION="Journaling incremental deduplicating archiving compressor"
 HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
 SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -16,12 +18,10 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +jit"
 
 # perl for pod2man
-DEPEND="
+BDEPEND="
 	app-arch/unzip
 	dev-lang/perl"
 
-S=${WORKDIR}
-
 src_compile() {
 	use debug || append-cppflags -DNDEBUG
 	use jit || append-cppflags -DNOJIT
@@ -34,8 +34,8 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${ED%/}"/usr
-	use jit && pax-mark m "${ED%/}"/usr/bin/zpaq
+	emake install PREFIX="${ED}"/usr
+	use jit && pax-mark m "${ED}"/usr/bin/zpaq
 	einstalldocs
 }
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 70416b1cfcc1..f2c0fc7db7bb 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/age/Manifest b/app-crypt/age/Manifest
index 743b6cc9e767..eec29c26da8f 100644
--- a/app-crypt/age/Manifest
+++ b/app-crypt/age/Manifest
@@ -13,5 +13,5 @@ DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAK
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip 21403 BLAKE2B f95e96b20328a04dd2a3a20985bf54d0d859a88e45f5f61eaee3f2bc22b575ae37c8ccf7275dbd68ac2851fd0d374f7ff8874ecc44c51629199a846154ed93d8 SHA512 82711ee27037e2ec090919fe58efb173626b31b4bc9e0118d732eb585ba4a16de6f1ee994b97ae78b7ff1cb89c34f6aa7392ff4b3432cf1cf2c56d101c64fec8
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-EBUILD age-1.0.0.ebuild 1526 BLAKE2B 97ea25b37ac4b3c313f14d2fbd60e280f76bae319ba572cae9746a3f38de15977921cb4923e26f0e260fe5f1652d7f50f836df489306b4f4ce7d5bb7ff4329ad SHA512 22a3a573ba0a76e81ca926c489adaaddc2883cbc15ba975732b619e6b04d71392f313bccd26fc9e14f903222f012162ddf9fae827c2a62aa07c08e8cf902c3fc
+EBUILD age-1.0.0.ebuild 1525 BLAKE2B 83cfd242a9ef9020d0a37a6591f3e2e0ba99ad82b124a5ac0cbe2533bde00c882fbe4dfa5d5c921af7aab2e9d949b9a7ef5e13d8abec8db247ca3a6619e5099c SHA512 82ed806acef835ceeba847161ca95bb508288e5c44826e05dc9898d7192583007d729d1deac5624b2f06fcf507fff4807a98bc6679e7c050e2aa47ad82771c4d
 MISC metadata.xml 495 BLAKE2B 8a96af0353f1721a164ab2308f4645dfcf214d5059e9b8897b3b3d57f8df44e1981cf083ae79e04eae04f61c2bb934a2b74a4f89010fc4dad4519fa45fb35c50 SHA512 03ce2c7701e7dcd1c9e73d094a6918da82fd3a792b2ca4ea5f753ad85a78c1bfdf9cc1f98b38ef0a7e9087502e730943f280e0ebb6ada7ac89a3e382d0901e1c
diff --git a/app-crypt/age/age-1.0.0.ebuild b/app-crypt/age/age-1.0.0.ebuild
index 851789821aa9..9aa23483c70b 100644
--- a/app-crypt/age/age-1.0.0.ebuild
+++ b/app-crypt/age/age-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ S="${WORKDIR}/age-${PV}"
 LICENSE="BSD"
 #RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="dev-go/gox"
 
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index 943d4f4caacd..24ee265204d8 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,4 +1,6 @@
 AUX pgpdump-0.32-respect-ldflags.patch 998 BLAKE2B fefa545f3c2d1d3ed3baa5a9d2b84b9b32745626883e9b8056fff045ceb0d06a490f5068782dbda07e4956429a2d2f31865c9c0e55b91bd9aa613f9ce6016537 SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760
 DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
+DIST pgpdump-0.35.tar.gz 77580 BLAKE2B 2c0b8d69bccf37a0d9a192273f901c52d74fa2423f32084a9ddda9c70c2055a0b594113b486cb9bcd8e9566cef781938186400dc139e9e00439db067b38307cb SHA512 03579d7d89d98f19f50c9722c063f059904887f7ca7da3eb99a4aadc6c5361b5161c891767a93087bfb42641aa2e24a9ad6560b1e4396370217afec61a988015
 EBUILD pgpdump-0.33.ebuild 528 BLAKE2B fe80721f60647fbf31fc20c9df52a0f4317c41fb21a866c2d47e057ec281f09d28fa0013943a20123153f7f128b6c83e03405eb9c5ead4e597f3ef536b6c0737 SHA512 9399dd1fc6aba64de1896e0ebafc2b99470ea3b85b24e265653df5f267de0c958c79da487cf1266efa73197b70c50d95ed25bde880e4b48f1058356feee63b4b
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD pgpdump-0.35.ebuild 526 BLAKE2B 86186bc9bb7c5dd571075ff9f7bd816ddff46c2ecff7ad27a84808cfa796ed16551e6ec53aa09e838a8824912e20d5f41d4fc25e4a7d468055ec9fff28a78ce9 SHA512 24664603c3c271dbc2c3f9a81fe14f337f9798af032052127cb19e1bea3544add3df4caef5c2ab634bcb6627626f7efcae8cfaf8c637f80c689e2b30ba55c5cf
+MISC metadata.xml 254 BLAKE2B c39b24370eb9491088f6f7a71340e8308caeada31bf26e230402746b603099e096a8b8f80b88deabebc07f9d3055c3111da87220137814482042e50309a45f65 SHA512 fa4f3d885634d2a414f4824bd250e03bcd17fbff0832f84ca03bc27e4564e772ec0e25b4de6968117f71b1f0a9461e91ac1d80adc84d679e2c83148c12a635fa
diff --git a/app-crypt/pgpdump/metadata.xml b/app-crypt/pgpdump/metadata.xml
index bef24d2c2337..f4514f627378 100644
--- a/app-crypt/pgpdump/metadata.xml
+++ b/app-crypt/pgpdump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">kazu-yamamoto/pgpdump</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/pgpdump/pgpdump-0.35.ebuild b/app-crypt/pgpdump/pgpdump-0.35.ebuild
new file mode 100644
index 000000000000..7027b53213fa
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.35.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="https://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="https://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
+)
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 1d58ef05240c..7c98db69ecaa 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -6,5 +6,5 @@ DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea
 DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962
 EBUILD signify-30-r2.ebuild 1181 BLAKE2B 2879a19c8cf90ff0fa5e3d076edab26c686af9c368e6beeef77cb039ae5ea7f32b4a7115b04d7650d16cbf695b6a1f198d7b070ad0e790f19c255e835ee19707 SHA512 3b5f3ab4508e9d7e3bf4e7521aaecf37ebafe6e00f0b86c03f0acd9f998f7d32d392b9c5dbd47f10d83d85764cde033d4bd3ed7dac8f80b61169342536ae02c4
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
-EBUILD signify-31.ebuild 1183 BLAKE2B 65db9d0af187155fb9ff298356bb3a5c0b6eee1b2c1ebe8088e4d8b6037537b3ee03cd97df8f668166f955d548f631f36d657445c582624adb96bf969ec5d8d9 SHA512 7c3a200db927e7f071060f028e277b034eaa2319ed9e5fd8e5727d061d54003026f2a215644890c59cf4dd558192681d3987b44e299d54ab9d2dc3ee79f40a42
+EBUILD signify-31.ebuild 1187 BLAKE2B cca26c100e6472889291ffb7ff42f360a4793eb607706a2f221f2cf9d2818e1c2cf13873b078ee33a33c2153fcc9b1fea73c6dec72b70bd85ddeeeadc621096c SHA512 a21c250a9dce0f9f2bea7fdca4fa20f4c4766188f7f982404ee18d09f0e8ced40de3de8a88a829f5ba8d1fc188d3b2eef09ddff1b0cd011ddca07f858b2223ae
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild
index 11d5ceb02801..aa839d08ee4c 100644
--- a/app-crypt/signify/signify-31.ebuild
+++ b/app-crypt/signify/signify-31.ebuild
@@ -26,7 +26,7 @@ BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
 
 PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${P}.pub"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-30.pub"
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f439e330586e..d8dee36270b0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 069990f3bd10..22a56c4d85ce 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,5 @@
+DIST mousepad-0.5.10.tar.bz2 959696 BLAKE2B bd21145f23f1e92d67489a3ffcdca0afd977aa639706dece5aefd2f5417d2b2122accc1a5c727ec13a4c2f311ec479612953006d78b5509e836f360566d0d320 SHA512 144e72abce8e5fb66a345fb59efe48f136dd9cf9cdcd72496dcee05b08781bdbba036f4ab5af04dbccd38dc52a8e8dd67b5b7434867881a1114de692a012b076
 DIST mousepad-0.5.9.tar.bz2 953685 BLAKE2B f8db50048964c789600ce6d310f6b6a893d7d4406d55f0666b7e78bf3e54446d3ec56eb70a059da6fac367d7c3f3fc5861fb29dadf28aa9b0d5e2f62056f3dfb SHA512 915fa1c89d66f793c4dba7826b4934e286e940dbdd9c933bddeeaf76be79d2140cd0feb1dea2946989879ec354d57af36fd61517309ebd4915f18be4b9cf621f
+EBUILD mousepad-0.5.10.ebuild 949 BLAKE2B c94ef103b379569e52eb08ed2b97a739c7fb239437edc80205bc3d7eae2f10a7d258ffbbbcd04c5c47927f5ee8e509ea1487933bab83c147f1bad7f3e28aea28 SHA512 715e846426610dace2b1339ddfc09caa1b6fe22a264aeb2f717f182dcbb8a351d8cd1851a7f8a68ecfb372a5841e2da53e96cd94b834c62843acaf3c81d1d130
 EBUILD mousepad-0.5.9.ebuild 946 BLAKE2B 3ea45bef3fde8b9e30342276e0ae7c10f6d42c6a6b3d4a5c5fa6b047eb8f765782ff7c26afbc799c4ae2ae4805046df0db3a0acc970ba6b8444a43ed284adad6 SHA512 711b0e18c58a879021f423e7ef714761720b285e377522fa33fc8b25ba2f1eb58e66c2a243a3a1287e0eb1720900e4a269c0752283930d225a4ce0a5790075c0
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.10.ebuild b/app-editors/mousepad/mousepad-0.5.10.ebuild
new file mode 100644
index 000000000000..dc34dc267e55
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.5.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.52
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0.0:4
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--enable-gtksourceview4
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d2260df76397..cdefdf3ce515 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
index c9bf7419822d..0a56b6ee3bb7 100644
--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@@ -1,4 +1,6 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
 DIST corfu-0.25.tar.gz 38366 BLAKE2B 297c8c556d32ee9f0a42265bbcd9b7cdd19881b8d85a9c92b6be84cb52e5558996cb16da596d13349fd1c9c72c7b6247e003ab48fcc41fd4acbe2d151b8e2e90 SHA512 602a9072cfa6a75672e1879e8da95b59355cc720482c8946311446c5722d13d0db6171eab8d899b689a689fe306d11f9b063e6bdc07dc710d9ee8f6f15b5aeee
+DIST corfu-0.26.tar.gz 38840 BLAKE2B 47dfcd2430cfd37c912cc2101760692bb1e4ef788bafec64760c81b02412119156b99d57a129e31d7109a62a073dfeb836453076f8bc59ece835015b4ec19ac0 SHA512 3996528e5ee9992462bc2cb241c36b7a05aeca460de0a04db542e6cd9eb7352067283ea4d8c668053003a7afc2dacc97e3b634842b847c05450fd8472ae8249a
 EBUILD corfu-0.25.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
+EBUILD corfu-0.26.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.26.ebuild b/app-emacs/corfu/corfu-0.26.ebuild
new file mode 100644
index 000000000000..7cc6d4bc7c42
--- /dev/null
+++ b/app-emacs/corfu/corfu-0.26.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=27
+
+inherit elisp
+
+DESCRIPTION="Completion Overlay Region FUnction"
+HOMEPAGE="https://github.com/minad/corfu"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	mv extensions/*.el . || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index 1cc5c26839da..c047e5aa185b 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
-EBUILD emacs-daemon-0.22.ebuild 1605 BLAKE2B b09a01d83b917e85e6cfc1399d5c209a562042a4781c3ceef0d3c832e86f876aad922a9c9e4e0956e459dd9132eec24e0029f63653d13adac5b8c06a1471b388 SHA512 10a2794632df7313018e9eb64ccd09263fdc6e6cac6046faa5864b3450e7154255df327ce4fce377550f937806721e21f07bfa1e5102567b08b39a3a5793e76e
+EBUILD emacs-daemon-0.22-r1.ebuild 1605 BLAKE2B feae81d6c9bc3d91864be406aac67ebc812082775dce13cc02da7d73d817809063c5fbeb74e1d77463625acd376f357fac13c56a7f024dd45b9e93befeae96fa SHA512 2dab2d5456cd27a4f007926fdbab8f727e370db08a9fb83346f3c0fad7baa428abcc8f9ca4034bb0de5480a69a55f6520777848e94960bcb58d6a9e2b1fd8d8d
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
similarity index 99%
rename from app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
rename to app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
index 3fc5437f04cf..2521891d7963 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
diff --git a/app-emacs/emacs-eix/Manifest b/app-emacs/emacs-eix/Manifest
new file mode 100644
index 000000000000..f5ff1b442b7a
--- /dev/null
+++ b/app-emacs/emacs-eix/Manifest
@@ -0,0 +1,5 @@
+AUX 50emacs-eix-gentoo.el 73 BLAKE2B 5554ab525a28595fc17488ece15cd4dfd5c52451de04c7e605d3901159ee97eaf5ae1403662131d99d6c400799063eeb442269740451c06515272153b898b0df SHA512 4e814ace69cad0598ae029555f6e251248c763a56203906f0908b35875f13bd9c537b8ac57357db9a80793ef20b34d2d2a26509065b7a41d3f68f9204fe1c1c5
+DIST emacs-eix-0.0.0.tar.gz 9522 BLAKE2B 12c91822b644cb3017b434ddc8a46c3eb9f8981ac45ff8e252ba937667e63e92f703f6c77a3675b2b89c6f8ef3188a785bcc7e1f122e2870c623d4330265c2a0 SHA512 6428ef15fa5b2367c727d63fd728e0d4aca24e4c0d8a27b566e664597b174ed94373285cc80979dac96bbfadd2ecdd3545170bd700a1130c41c39d3d8dc55b88
+EBUILD emacs-eix-0.0.0.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
+EBUILD emacs-eix-9999.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
+MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild b/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
new file mode 100644
index 000000000000..2821ddbc8bc4
--- /dev/null
+++ b/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Eix integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-eix.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-eix/emacs-eix-9999.ebuild b/app-emacs/emacs-eix/emacs-eix-9999.ebuild
new file mode 100644
index 000000000000..2821ddbc8bc4
--- /dev/null
+++ b/app-emacs/emacs-eix/emacs-eix-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Eix integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-eix.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el b/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el
new file mode 100644
index 000000000000..84922cec1265
--- /dev/null
+++ b/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "emacs-eix-autoloads" nil t)
diff --git a/app-emacs/emacs-eix/metadata.xml b/app-emacs/emacs-eix/metadata.xml
new file mode 100644
index 000000000000..22c7b92b1e0e
--- /dev/null
+++ b/app-emacs/emacs-eix/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>emacs@gentoo.org</email>
+      <name>Gentoo Emacs project</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emacs-openrc/Manifest b/app-emacs/emacs-openrc/Manifest
new file mode 100644
index 000000000000..b822d8659ac4
--- /dev/null
+++ b/app-emacs/emacs-openrc/Manifest
@@ -0,0 +1,5 @@
+AUX 50emacs-openrc-gentoo.el 76 BLAKE2B d6feb9a58260c132884226add7fc2c6474d87ed553feebd1d322b580325676bcd4666300f98b9ebbf582f6553dd1e933c80f8fc401bc09f9f56b43c8fd5f8e15 SHA512 2232247e3aa041d742ccda3f47cbce6a82a191f9b4e2b8d4b66d2571be1fcf202fb954c4c9116c32958e9da2b26c86395c8996242a12dd335f4b3da8b1f49959
+DIST emacs-openrc-0.0.0.tar.gz 3453 BLAKE2B eadd1ca5f338263e3d7b5c562c7ba1afd8c68dd0a9dc7c682c7b9f8148cbeecb2d8de6c621c5a63262fdcee173bf001ea56a13e40224ece9c9627b2fa84f8bc9 SHA512 04723bb9f087b5da6cea46898af78c6308bebb9f1fc6ee872d9b054bbaafdcb9afaded4f31b318b2f8558e0831243d0006c923e33653fb418c35569112f1bbb0
+EBUILD emacs-openrc-0.0.0.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
+EBUILD emacs-openrc-9999.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
+MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild b/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
new file mode 100644
index 000000000000..f312b46f306e
--- /dev/null
+++ b/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="OpenRC integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-openrc.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-openrc/emacs-openrc-9999.ebuild b/app-emacs/emacs-openrc/emacs-openrc-9999.ebuild
new file mode 100644
index 000000000000..f312b46f306e
--- /dev/null
+++ b/app-emacs/emacs-openrc/emacs-openrc-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="OpenRC integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-openrc.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el b/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el
new file mode 100644
index 000000000000..9118d373d849
--- /dev/null
+++ b/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "emacs-openrc-autoloads" nil t)
diff --git a/app-emacs/emacs-openrc/metadata.xml b/app-emacs/emacs-openrc/metadata.xml
new file mode 100644
index 000000000000..22c7b92b1e0e
--- /dev/null
+++ b/app-emacs/emacs-openrc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>emacs@gentoo.org</email>
+      <name>Gentoo Emacs project</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index e27f44ea1b96..33fe91c0dfac 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,6 +1,6 @@
 AUX 50vertico-gentoo.el 82 BLAKE2B 89e0376cb0361d71ad40318455820607ac23fe004dbc80c77c9943a94426c47ee409956e0770a1f8c3157b50f0f105275337b0c94b597755dac59baeac29eecc SHA512 ea5c77218cab48e770cf56d1732b8101bbe453fe5e98fccf92c6adf53fd3aa8c1c3fd4d33e02fcb02d7ef44c56661e9c593588ffefec0852ecd43c00da30a5dd
-DIST vertico-0.23.tar.gz 42631 BLAKE2B ccb5a30cb3da9bed0a16af06919635ebc23777d0f19fad4fbbb422b0bf04e38f1de1a51e375263f212b0ae25881f4428e9fc6d665ef46ff9aaabd3964b4ab006 SHA512 7425b33a7628e8fd246386908835ee52ef357ecd3909a6cde0f9ed89dc468590fc854b599c2ed13572003ef6b36bd8df26db3da0764feadc407918ed68ba910a
 DIST vertico-0.24.tar.gz 42777 BLAKE2B 64e3f11dfb425c814665b49d755a52db4146c875969be7621539892f72df6ef9c4186be05373230b48369f1e2e85aee8e97cb829afe3618b9507170c4a8ca1a0 SHA512 67edb7e45e257c2cdf53d7adb2b29eed8cb3a1ac42dcec41bd555d553c60e4fc9806c6ad51b5cc183abb1d3967a4f43ab0e4ce0d317f77eb4d7cdedb9ea39834
-EBUILD vertico-0.23.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+DIST vertico-0.25.tar.gz 42765 BLAKE2B cb87a0226b741f2e7b1e90b339debfef3caa4abc89dc5aecaee1c7a76ac7db6fdc4f13019ba6993f696735d4b020aa06caabf497f6e9b2047b24dd4e434a176a SHA512 aa2ae45f93412e45ed9da0382ce69a2a7a18196f80789915bfbf9edb1593f5d5ae3370d2f0c03059ef7eb38cb664052fb0a49172f51e304bc389df439a51ad61
 EBUILD vertico-0.24.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+EBUILD vertico-0.25.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.23.ebuild b/app-emacs/vertico/vertico-0.25.ebuild
similarity index 100%
rename from app-emacs/vertico/vertico-0.23.ebuild
rename to app-emacs/vertico/vertico-0.25.ebuild
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b09200cf1ae9..cdc99f6111d2 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index df3917f21eae..bd896209f313 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -35,7 +35,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee63
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-tools-4.15.2-r2.ebuild 17828 BLAKE2B dd49a8492b9b2b27eaea3702aba04d663a8f4eb052e4d92f34b8ffd3165ef23d6d20b024a5894ac5ff9555cecb0efacb785d6a70a9393c564862e1e8a3b7e267 SHA512 1955d40d91295250d173568c80dea737c082e17c4e90e5c980158fea90384b6705cca5911207d23da67b9eed6779f8a558e848322b495dbb42e1b0ae890f9884
-EBUILD xen-tools-4.15.3.ebuild 16675 BLAKE2B 0343e102f9531f96a245c5de0d3cdcc611c77994f4749b43552ebdc439f798f457e02e36096ef6839618985cb5dcd743aac5a8a825e856b7bd0fd71da21708bd SHA512 297941822cb2b439366a076f013a0fd261d8e0ee5f3db14cb667d9f911f7bb8ff80f6bf1202b6e0c4dbdfba89ee3341bddef3dbaa22bf95370a4085d6fa08e24
+EBUILD xen-tools-4.15.3.ebuild 16674 BLAKE2B f46069a7e22d990a5afa8700241d420f99b4d1306aa12d146b3528016f4d2654fdf6b23bd5397621c806a4ece794b7102c3e18d2b34a71673b3b0a0a8544a799 SHA512 e7fe61daefbc84ed277581eae742e158cb8ee488c9a5a1a6d2ca59492805773941ccfbc986b0f756ec6b917d7cc68e0c455c380e530ef5ec23e48add0de9418b
 EBUILD xen-tools-4.16.1.ebuild 16548 BLAKE2B e16e6217d6573365bac929c0c796232876ff480bb53d46bea52e707158f582566543ee1688b161f1c95e9a45818c30d82e98b0fb003acb1239440d1b5dd3e984 SHA512 83dc4460ede881c701641d700dbd938d42f7b6bec2e9c2674e4d925ffbd61d25f7a1e3ef11a17547101011f293c9bd1da97514b6bc16f31cd57141593519832e
 EBUILD xen-tools-4.16.2_pre1.ebuild 16785 BLAKE2B fcb88e3b26c6fab27fa3f82c4f5684044087cb1479e470bdc5ed1985016cb3cf44c41733b7eb06f5bb9648d2c46dcbd456f0938439ab3eac357281c7e6dc66f9 SHA512 911c6e0731ddc7b6bc7a567e25155ab0d05ad537e970cdda961f3904b9ca73696698c7b5c9ae7d4669cd2e4fab8e9b40f2e7f22c85eae6e77c7e49c20fb2afca
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
index 60ce532a0998..3c52b578af80 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 	SEABIOS_VER="1.14.0"
 	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 303d453b62ed..f4ecd12f2933 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -10,7 +10,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee63
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-4.15.2-r2.ebuild 4405 BLAKE2B 0090bf96c539f0ec10bdded08f4a67d5413bfed25e9f85b68c65e7c49bd4c220d493b45800b3515c81c8bde3670a29cc34a6d079b9429ade6ed69e0ee47ad0c8 SHA512 355a160d6326367eb12ca7c0492b324e35d8b635e295e5a8b0c431ca44bdded9e7c2160592fdc4327ad1473a593d03f9e6d71e80ddc2734aa9ed87b6319da6d3
-EBUILD xen-4.15.3.ebuild 4725 BLAKE2B d0438340e0d61dcb8cafa07346e2fd361159e837e5fc1bd03b4f883c4078a26cdbc26c513e5e8300df0b836792572933e934ac0c6631861bc1985e44a794e43f SHA512 af40801d682f55e21d0a17b4c9fa5a2f947104a04d4ca9b393fe6244effecda2eb94112e3708fdc89ddd0f34e0d5bede582063e0593ee40b262f83af3da7a2e7
+EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
 EBUILD xen-4.16.1.ebuild 4832 BLAKE2B 2a9fc53ee631e5ccd502f419ea1437dc1988b801812a83a21f1ff04a2b71e85046c24030843c77d580e5cdf6dc4edf6961678ce33b77495ead4e3e51c4aa5c59 SHA512 fb7dec4bbc69f85e8824f984a6acb49b94be2192403ef8ea57dc3b13868e61044a274045ceeb2c0ded3e09d0776bc7c30cbb448359e9af35ad777079d93de533
 EBUILD xen-4.16.2_pre1.ebuild 4761 BLAKE2B fe2c436fca2d516c4ee588c265898b62278636609119768d7ec4319ad2a011cd91c8224d289384ea9fc2f38006437134a96b028d78846488badfea0a2313efe7 SHA512 600b693dd83b464fe57229b3ba3bd9acb42c88ea9b207f78694bf31d61e59ce407c675dd968e2222ffdfc7f8227f8a58a65be951dcb321481eb49eabd7818e75
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.3.ebuild b/app-emulation/xen/xen-4.15.3.ebuild
index be0c811dcf7f..ff611b2ed315 100644
--- a/app-emulation/xen/xen-4.15.3.ebuild
+++ b/app-emulation/xen/xen-4.15.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 
 	XEN_PRE_PATCHSET_NUM=
 	XEN_GENTOO_PATCHSET_NUM=
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 53aa9d0a1ef1..8af1405ccfe9 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index c20fd0734871..e6130c1b1bd2 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-repository-12.tar.gz 8543 BLAKE2B 14866156ddfefebaea368c4a13413d79e7858520861ee2b699cb09b339f3bb4b8393af7201b4cb7d6a60d2a48d168a053cc4707e2f56a7a2a11cfb5156cfa83f SHA512 3b98b9bd87fe61c7fb4d314e72c8433b11dd80501cfd226d4a4de25ca6d08e7a14a2497a1700ac64d704368bb8e5ea2ec337d0712097e9e10182a3122a59e388
-EBUILD eselect-repository-12.ebuild 1125 BLAKE2B 82d0d8205eaca79fde9f0ccb3ce5725f8cea347562edb399b67a1d61eda7461cf0ea0fa552b8dc5ea7fadbd1ca9c4691cf9f72994b45132d4663e7da35dd6a71 SHA512 ff8dc807ca091e59053500d92937af1b79532f4fecd69522fc82601d77a0adb26d6d364b5e6e3726acc8fb0e7fea8af5995f3730a68b518cba3d1958a7e3c9cd
+EBUILD eselect-repository-12.ebuild 1132 BLAKE2B bca1e805b471a778ba34a2f631b241beda9ae6fca973770150e7953b5ea82c65f0b65c03d3e3d7f9f873e5808a47ae3a73879f3d9f2c11a8df85d970dd0d3a3f SHA512 74db060d26a13190d950aa04c650b19f58e76e4d3c22d142c16bdbbf88cd38067bff96186fac47ba1e2585653758d54e57d52f039b94a5ff52640f66f459496f
 MISC metadata.xml 362 BLAKE2B ab27b034d147af4cee32a9eb0474cf127c0ec71b0cf57793f2a4a6cb410a9ccf9695233c30fdfcf0be0ad786962d7fcba9c74f2d0840608e98280f1aaa5f5c53 SHA512 d80c1415e204a86c0d28ea07b5f909ec7b3e1f7db407758e32dbeb53845a3b5239536815b60e7d7022017b7f8f0a8e331f93503f0062d104d9b8c6715f261780
diff --git a/app-eselect/eselect-repository/eselect-repository-12.ebuild b/app-eselect/eselect-repository/eselect-repository-12.ebuild
index e226ea120253..cf42d7f83aaa 100644
--- a/app-eselect/eselect-repository/eselect-repository-12.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index 3f51e15ea04e..45963d7c8b12 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
 DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 541 BLAKE2B 155c03035601a051f89d046cde1cc6f6a6c220dcf5b879b6e7f3b85e348e93bf40f85bc0a85a08fef3326a364350df850949e366bfd2301fb40078e42a61d3ed SHA512 97e72e879ac51694462612fb30c7ef50ec2adba7544f828796fcd38b1bd6688512b5141d4a3a25a487e51e7ff52812cb584ba4342b2d120ab5f921df5830b1e2
+EBUILD eselect-timidity-20110513-r1.ebuild 539 BLAKE2B 9409370f0b371b558a3b4f61db3251b844d748b6b916a321734d09a69de835e1c33ccba1ac100f7c58648677f8929ffde085368d9b72a209a1bec7cad60a45ae SHA512 fdf3b05a59f002312a2f2403490c1aef713126347e75a962b57a4e07fba74b54ae9160c6bc6a3aaf0b4ba79e32387129995b4c9ff082e41fcba81deecccc1cc4
 MISC metadata.xml 278 BLAKE2B da5e1399154ec68205d578543dc3a2501d07d8f850be2129b9ab387bea29d8e72035b830ac352812c2dd9cc4eaa839006453639bd5d0b91ed84fa8bc710a7a02 SHA512 824860972fb61eaae09916cd512bcdd8463a120385763bdfa95570644e36cac0eddf2c2d2893cf36fd80ff6b82ebae679ac45e50ca91076edc3c6d1c3ff73a33
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
similarity index 70%
rename from app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
rename to app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
index d033658d49e8..885170c412e5 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Manages configuration of TiMidity++ patchsets"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
+SRC_URI="mirror://gentoo/timidity.eselect-${PV}.bz2"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect
+	newins "${WORKDIR}/timidity.eselect-${PV}" timidity.eselect
 }
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index e049e6ea7f77..c5a21f693041 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 43a6d004371b..5535f7563065 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-m17n-1.4.8.tar.gz 494516 BLAKE2B ec4cb36d465e25a6e0e334243e7df83444846f9109ef2142daea4949ddaa7cdf5290fc2749a978f7b8fb6d49bb080b2b826726fdc97e26bc722b019c93f13882 SHA512 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec
 DIST ibus-m17n-1.4.9.tar.gz 494921 BLAKE2B c0adc4ff702b7a9828c6d966b52eca90f7f538786f17a9e8273dd13bcdfab59c24e59b2f680f1582bf4dc077dcc2e3c774258d09f58fc296b32d090ee42531af SHA512 6a7d7316fc98e832282302a5d54eb40b6e879f98d6910db8d2c834be6c23ebda30ccbc5ed116caa3d91148e5bb2260c49f670c8c7fb2c6215d31f3e6794cd3ab
-EBUILD ibus-m17n-1.4.8.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
-EBUILD ibus-m17n-1.4.9.ebuild 803 BLAKE2B 6bdd0fe9346a907b2291c3df2a4289d826fd1417db6c6419bcab2eb459b0b860e5e9921d428b400637029f3a7bca914032f6aa428bba4926bcf14fc5e9fdebf3 SHA512 a953de9583a6e475518297e665efc9fe3afb9314f96f85b21a91c6e9560f1a1eb7194b51d0a02b6a6b9ec57ed0edc3d17430b83235333135d6cec4178ef686fb
+EBUILD ibus-m17n-1.4.9.ebuild 801 BLAKE2B efcc1d3eada14d85fa8c81cbeb1c94b38b626c53bd7e94749b481c21f3a9fcfcbbfdadc52fbaa594ab542f2eee34ad9629e19672c222f83fd69cd69db1dd3cd8 SHA512 3af87daa9a79b2bc0a9475a45aef9011d5c2ede82f6878ca9cce8b6bd4471e1dd3da316cec4d1e603b8d14c98208115aac7bb504c00fa29df9ad4c8a826baff6
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
deleted file mode 100644
index 8ec1183befae..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.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"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
index 1466a2deebfc..da3b9ae13bd6 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index e6861d068024..c47c13ba6aa4 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,7 +1,7 @@
-DIST ibus-typing-booster-2.15.25.tar.gz 10785373 BLAKE2B 555105c9da7a813491e3ab8cbea0a8b52239c7ffb39dc7a6ea47e461d81515ba3cdf1adfe8d8cebd74bb2b00775eac3b19956aa9e4c4b696e6083418e2b73e91 SHA512 927f118eac1a641f658b82ef72ec8cd728727910f6c2bd77a14d9195a8203fd40b771e68a04d7ea7c5f5c1f2cd4ff37b7e041282e63f301348b60af462e041ea
 DIST ibus-typing-booster-2.16.0.tar.gz 10811558 BLAKE2B d171972f3c6242234ce73112e4ea8fde9e713e102a7fb2111017e7489811c1128146582e2a9a60f49dfca8b5282949415fb33e79b7c1be16521dba2dd03536fa SHA512 a90ea11a72d770765ef55ff6fc288bf6ddfa5e5ae1c7393f195ed3466a207022872f5e27f9629101b8b31e26c84dc8512e4cd261b2c503fd98daa8438e47dfb9
 DIST ibus-typing-booster-2.16.7.tar.gz 10819738 BLAKE2B ac9da1e63d97045881d8012b5dc6bd27cb8ee48aff065876cede2b40a81518880e610580f13590ad89f6261ced266e1d245183ea77a3a56e32b60af08af28470 SHA512 f0dda59b43460c39392ab12748780e93668ac81aa04b15aae2afa2025ce8bbc9e2712430658f43db7e86c7a1e59271d62ecf6cda6cb2b9cc554134000c21c95b
-EBUILD ibus-typing-booster-2.15.25.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
-EBUILD ibus-typing-booster-2.16.0.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
+DIST ibus-typing-booster-2.17.0.tar.gz 10826479 BLAKE2B 923bd98ae615e32aebf7c337aa84fd4ddc06994fa87f2b1fbe8bcd73eef2269d22bb2943b0e92b19fc14a3d159f43d8d6c161d0ebe3e1481d4dcc15d80687b37 SHA512 87aafcf787f64bde2fe42e6f109d22b0c129a15fd3a5a32190904408e4a57322b316ac92b5cd2cd3489cea8a764db57cf20a7d4ab5981c5c9da6b517c9dc0003
+EBUILD ibus-typing-booster-2.16.0.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
 EBUILD ibus-typing-booster-2.16.7.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
+EBUILD ibus-typing-booster-2.17.0.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
index 58166b805e3c..23bfd6ae5804 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.17.0.ebuild
similarity index 98%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.17.0.ebuild
index 23bfd6ae5804..58166b805e3c 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 761d26de2831..669d54f409cf 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 8ba9db6bd6f9..d08499216cc4 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,5 +1,8 @@
 AUX ckb-0.4.4-libinput-1.2.0.patch 1188 BLAKE2B 36ee73dbd1f8ffa70fae27dd4915837d09eef2226d908aa4cd8e7b5c9bde2a645cb212535d33879efdefee687ac52177979116a0ef81ee921f24fad1654608de SHA512 1d39cfe1bceb8b950f6952e57c7848870a3ffd359adb2245b570dc9fe928480b07cd5332e3cabb9b47090b4b3216474f380c5679db963611c7657bea7d3ac083
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
+DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1
 EBUILD ckb-0.4.4-r2.ebuild 1269 BLAKE2B 6f89a70844db99930f3166037efbdcbdb1ae37dd777ac44642c215ad7ccfbbcf2cd4b93cfdff204a2eb165a1469689576d2d469e53493475a103af6e6a2690ef SHA512 8606b55a8889e04b56e1e9b6299235b78781151d3be0bbd852bc6b72a3a8e34993cf5c22a43bf31914e3a807fe58f2d89683327543f38f0622c674dd793cfd97
+EBUILD ckb-0.5.0.ebuild 1383 BLAKE2B 6fac392ed01a5dd15288f02a78c481c4a90e46973bb72f40d251a662bd6d78b9d1fa56def7cb0e68e8147c2afd351986f410e9f398363b5775a1bb2d7dd3677f SHA512 fdbe58405022601d56f8b4e1b97834d02da0fddd21e3545c4f28ffd34b50fe868c42f74e1c1a8dc31d202ba1e89527595db560b55fcfe395a280c66c6f4edd4e
+EBUILD ckb-9999.ebuild 1383 BLAKE2B 6fac392ed01a5dd15288f02a78c481c4a90e46973bb72f40d251a662bd6d78b9d1fa56def7cb0e68e8147c2afd351986f410e9f398363b5775a1bb2d7dd3677f SHA512 fdbe58405022601d56f8b4e1b97834d02da0fddd21e3545c4f28ffd34b50fe868c42f74e1c1a8dc31d202ba1e89527595db560b55fcfe395a280c66c6f4edd4e
 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.5.0.ebuild b/app-misc/ckb/ckb-0.5.0.ebuild
new file mode 100644
index 000000000000..4629a34e2bd8
--- /dev/null
+++ b/app-misc/ckb/ckb-0.5.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev xdg
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
+else
+	SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-next-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	|| (
+		media-sound/pulseaudio
+		media-sound/apulse[sdk]
+	)
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-config start ckb-next-daemon"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/ckb/ckb-9999.ebuild b/app-misc/ckb/ckb-9999.ebuild
new file mode 100644
index 000000000000..4629a34e2bd8
--- /dev/null
+++ b/app-misc/ckb/ckb-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev xdg
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
+else
+	SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-next-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	|| (
+		media-sound/pulseaudio
+		media-sound/apulse[sdk]
+	)
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-config start ckb-next-daemon"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index e5e07d2cc66c..652ca3fe3977 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,3 @@
-DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
-EBUILD colordiff-1.0.18.ebuild 917 BLAKE2B bcdf9e6db91d0420b86cf38a80b4e754c429f569d592cef0e451c5b219f3cb9ae249bc064924296f9a88fd1c020a9f3f9e8c0ca98eee7685d307a474343d92e9 SHA512 41b01336f8e170cb77debc4b61102fbc74fcd00b2933ed40fdafd1128c211111640232810adf5666483e4ff01605d0a7abfeffa1c314f9c00b3947ebce33c79d
 EBUILD colordiff-1.0.19.ebuild 924 BLAKE2B 10cbd7d823f7bff47e499f954af8bd068696d0fb7f3d0c5203c10b4686f21054cd970e45844cd692e5d5c8a67d671976871e44f241a54f8eb12f0edd953cb6d1 SHA512 1d458d91463cf97690d0f1788e54a83695acb50ed67c88a8a68c081a1898921e51f641cd208adfa637750d1c7fb75052cdacf9cbf8ca6c03b3b286e715cd6588
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
deleted file mode 100644
index cbf68c547973..000000000000
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Colorizes output of diff"
-HOMEPAGE="https://www.colordiff.org/"
-SRC_URI="https://www.colordiff.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-lang/perl
-	sys-apps/diffutils"
-
-src_prepare() {
-	default
-
-	# set proper etcdir for Gentoo Prefix
-	sed \
-		-e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \
-		-i "${S}/colordiff.pl" || die "sed etcdir failed"
-	eprefixify "${S}"/colordiff.pl
-}
-
-# This package has a makefile, but we don't want to run it
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}{.pl,}
-	dobin cdiff.sh
-	insinto /etc
-	doins colordiffrc{,-lightbg,-gitdiff}
-	dodoc BUGS CHANGES README
-	doman {cdiff,colordiff}.1
-}
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 506ca100458f..b8c5047b68ea 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1161 BLAKE2B 3da23dbce45bb03391e2b57e21335350b88625af7dc13e5755275ed44f1997b39d9ff4c6f76167b4eed19cc9baa02d033dc0c4247ddc72081ef0531217847149 SHA512 7769fcaa1569b71fa399ea201afe984390d8a9e96adfd3fa0e76ee253057816542ac609978709b046604ee99c2cad660fe60f28f2c2a9ca4457380a70e2cb6a4
+EBUILD neofetch-7.1.0-r1.ebuild 1168 BLAKE2B 088131f3bfc96d7811f00e20b8fb33ba16700c5937180e8d559ab762e95cfe670c29e73c6547110110fae3b50a8bfe1b8931d7e4d0b520fdae1ba05085b3faec SHA512 89d15c3d70d9c6285994d478bd3b86b515ebc7e27bad72d8013b646b7bd0db5b59b09a86c000fbd91746b2e273ba77ac72a42414cb1bcb4a933481477b0bd893
 EBUILD neofetch-7.1.0.ebuild 931 BLAKE2B 18529203cb10f998aac1bc1cc77bdd04f8b448a1300ea66cddebde7dc4b3aab39475510c8620394ce24468064829c203e3e5423662a0309c15a8d8d8456ad56b SHA512 0dfefe008ee20208971268cc8b3bb871e33af9572b5675ac03e16ff4cda9b1df1f64b57d7ef920f28c811010b8599ea94fc7c6ae61c77245d74004b6fec975e6
 EBUILD neofetch-9999.ebuild 1148 BLAKE2B e394cb2022126384a48e8bae54347953c9334775f211655be310db220864b0e4231a11c9444886c1fbbab6f1b66a45e404eb34372c43562aa51eb0156e8a034a SHA512 914cc993b854fd0a1605046dbec42ea0bfec8f841b16a7b264f629370182be518993fe4d0837580cbd6bd1759da6105f7dc09562f71f90374f63a6fc2801e239
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index f78a54fd99a2..4e73e299058e 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 242293434224..5cb5c6f6946e 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -2,5 +2,5 @@ AUX rbutil-1.5.1-cmake.patch 1518 BLAKE2B 1755a6cf567775afc5eb1a9b9c12ac29a01ed2
 AUX rbutil-1.5.1-headers.patch 475 BLAKE2B 3bb6bfdaaa16f8401b9efce799a2a726b8c903a20b97191e41ed01b7970f7629b997fa6e044ff9472e64947cad207dcdb0c71ca1489e391648a8f30c06eaea6f SHA512 ebf25d30cb067d831024973913f8aa48de6b282db667939a4bdada4a44f7d74ccf58f764a2aa079dc3f7875631638070b75d7fae65d670836460efc1f0dc64f8
 AUX rbutil-1.5.1-system-quazip.patch 5656 BLAKE2B c36a76ebe073055ea4c7e840f532a3a356b824d1aba5f4082f88176a5ffa5a01c1a4b199346baa1a2ac910698fc0fb7cdb222fc7c6ee7f9f83f5e945301b64d9 SHA512 3ee97efa7453ad7fc77a39dcae9225f1a17b176b62cde1033a3426d5f8786447d260a284f43b6fcf8bd7c8a5049f845a4241daa057ee81ad342d1994c83529d7
 DIST RockboxUtility-v1.5.1-src.tar.bz2 1495776 BLAKE2B 0a5009cfbe610a46a98d72d184cb49852ba6ffbee7a826bc4d69a7dd06f982695c6964586c48cf58b2f12ee5f650ec2ee0c650336ea987b2c8d62b459f2333cb SHA512 623cdc7bba3028264448f072be1e9a754afe544cda1193bec051dd390acadea213cda8f00e25bc3a0254a282f8f6b2ba34e67c2ac0d086c0a74d52df1fd733fb
-EBUILD rbutil-1.5.1.ebuild 1357 BLAKE2B f20eec18297b0ba9995a33a3b2349a572111e2c4b94eb1ae9b288ba4cb090eb9d1e44560ec3f40e792c1a97003cb43906423bb191ef57ecbdf161ec9409ec39d SHA512 daf0fbdb87ffe3c1424c68d513d838ea599544fe3cbd654c1c26f831329a58fc09fa28bbee147c61c8ffd5aeb6b826c661b73f3ca5c1ffa94c5c158d60a67eda
+EBUILD rbutil-1.5.1.ebuild 1377 BLAKE2B 7db81a14b5f15f795d7d1ee2c0b1814e3ccffd60bf34583cf31fc813c92c548bc8428af558d4afc324a6468a84b5e3f79324bb6409ba7e94bbb1d973138a4fa9 SHA512 13182bb33ffe2b47a4c0273eb18ab98c2953f5f54d87a8de8716effe2dffc018768a9a576372f7b112b81c0939303609333b762addb0eea03f1f534417d2cac6
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/app-misc/rbutil/rbutil-1.5.1.ebuild b/app-misc/rbutil/rbutil-1.5.1.ebuild
index 96956195e14e..c4d3f49101d8 100644
--- a/app-misc/rbutil/rbutil-1.5.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.5.1.ebuild
@@ -26,7 +26,10 @@ RDEPEND="
 	media-libs/speexdsp
 	virtual/libusb:1
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qttest:5
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index ae509a6d373f..d28833f5b9ab 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,3 +1,6 @@
+AUX scrub-2.6.1-bashism-tests.patch 2064 BLAKE2B da474dc7501fb9b7c1b93a69b938b9d4b09643e2149a355696828c84a62c364ff8fff75a18d28a8ad110bbaa12beb780a62722550d33ead7359b36230bff7370 SHA512 b5fdcf71f862c633f86fdc5f96c68c2d88f256f3a685f655919e4524705bc74ed9e96dcfdd672741fcc9252cfcc55e4fb3afaad5c246b763ff3f8ff9ba92c442
+AUX scrub-2.6.1-implicit-function-declaration-test.patch 594 BLAKE2B 824a8a3d1801a22c090fea14c917e4f9eb5a662d51981d26317ca57cb90003cbc51768bdfb628483e906150d385e66ec7ee7a505c78bf11edf5771a9595fbe90 SHA512 efc0874b03c52591e24035d914093d12f8894272cb9a0bc7e212385f44a8a624f50f933db0412d64595613cfb43fbff37540cc8327ca15471aad57d264b75451
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
+EBUILD scrub-2.6.1-r1.ebuild 489 BLAKE2B 388e129579074b030f49671762dcfef0131683a76026348c1723a2a6dbd17b7d732cc6dae75f264bba51eea1fda0adf5fe7b1b86c121201050ea993e2ef7c52b SHA512 2e602ce7ca40276b45e18a58d6beccdd03ad3d1af410b324dd652b8b91e6ed6932a684dbcd266f36597e902a23b5cf45cc3fec0251a59fb767f758c736cd12cc
 EBUILD scrub-2.6.1.ebuild 397 BLAKE2B ed880d7b83b0e71346cecaea24edc4ae795918bf1d990cc57602179c18db28f7ccaabe2e3722bf73d817c51cb3e04f0356216edde8c13e1c994ab5df603fc9d1 SHA512 9b6b275fb38e9de843335f27d8fb41cb07ba67f38fef39c64ac8f99ce0c6d51fc5410e1a24cf51295cb17af8523b4ddfe024f2f0040222532f79751c9567d153
 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62
diff --git a/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch
new file mode 100644
index 000000000000..17999f341cd2
--- /dev/null
+++ b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch
@@ -0,0 +1,85 @@
+https://github.com/chaos/scrub/pull/31
+
+From 545d1b9cae8da18864277ca14a227d4adfafdc32 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 10 Jul 2022 10:23:09 +0100
+Subject: [PATCH] test: fix bashisms in tests
+
+We're using a /bin/sh shebang but the tests aren't
+compatible with a POSIX-compliant /bin/sh (like dash,
+instead of the usual bash).
+
+Switch to = instead of == which works the same but
+works with both Bash and dash.
+
+If desired, we could switch the shebangs to
+/bin/bash which would work.
+
+(Notably, Debian defaults to dash as /bin/sh).
+--- a/test/t09
++++ b/test/t09
+@@ -4,7 +4,7 @@
+ 
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ EXPFILE=${TEST}-`hostname`.exp
+ TESTDEV=/dev/scrub-testdisk
+--- a/test/t10
++++ b/test/t10
+@@ -4,7 +4,7 @@
+ 
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ EXPFILE=${TEST}-`hostname`.exp
+ test -f $EXPFILE || exit 77
+--- a/test/t18
++++ b/test/t18
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTDIR=`mktemp -d $TMPLATE` || exit 1
+--- a/test/t19
++++ b/test/t19
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ LOOPFILE=`losetup -f` || exit 77
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTFILE=`mktemp $TMPLATE` || exit 1
+--- a/test/t20
++++ b/test/t20
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ LOOPFILE=`losetup -f` || exit 77
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTFILE=`mktemp $TMPLATE` || exit 1
+--- a/test/t21
++++ b/test/t21
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ 
+
diff --git a/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch
new file mode 100644
index 000000000000..8d6b40a97536
--- /dev/null
+++ b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch
@@ -0,0 +1,22 @@
+https://github.com/chaos/scrub/commit/188d999e2fb038dc702b47750d235ffd284dd518
+
+From 188d999e2fb038dc702b47750d235ffd284dd518 Mon Sep 17 00:00:00 2001
+From: Jim Garlick <garlick.jim@gmail.com>
+Date: Wed, 21 Jul 2021 13:09:57 -0700
+Subject: [PATCH] test: fix missing include in test program
+
+Problem: tgetsize emits a compiler warning because
+strerror() is not defined.
+
+Include string.h to get the definition of strerror.
+--- a/test/tgetsize.c
++++ b/test/tgetsize.c
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libgen.h>
++#include <string.h>
+ 
+ #include "getsize.h"
+ 
+
diff --git a/app-misc/scrub/scrub-2.6.1-r1.ebuild b/app-misc/scrub/scrub-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..a7c1ab7b6ea6
--- /dev/null
+++ b/app-misc/scrub/scrub-2.6.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Overwrite files with iterative patterns"
+HOMEPAGE="https://github.com/chaos/scrub"
+SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-function-declaration-test.patch
+	"${FILESDIR}"/${PN}-2.6.1-bashism-tests.patch
+)
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index bdcc51ae06d1..aec88c4ec74d 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/impressive/Manifest b/app-office/impressive/Manifest
index 3893cb813b13..e4d06dca5997 100644
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@@ -1,3 +1,5 @@
 DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e
+DIST Impressive-0.13.1.tar.gz 215989 BLAKE2B 6591e5fa2c34e7e6f2283b9b6f8cce7485fc8932eea571af96c895bbe23202af195eec0318272667d5656f3aed7a88a21a20397224c7c0cc7c9252364d832371 SHA512 f6221337f9dd79f552fb083e1ea7484aeadec1f8d8e05b4e1b7f6a94037b5026022819b346968dea67dbdb1b646d0571a7aeef26f15c25bee88c5b9c2791cf2b
 EBUILD impressive-0.13.0_beta2.ebuild 1111 BLAKE2B ab86830dcaebf3e0a5d31576bad253de2acb682f1ce26136567a4454cc65872cd8994cc022f1899f3e5a47ee6403d95697d807436f458abe403d4eca18c541d7 SHA512 f3472955cce7e0432637c9bc419a388af645a2ffff187020914117da60c941b862b880a34f8af8c37b5eb4ad77396103b11a2f988d7084c2cd5ec6e920f906b0
+EBUILD impressive-0.13.1.ebuild 1111 BLAKE2B 509a9692bedee47a6ea2020c623f7c13f15fc0308341b19ac3f3f651f96183115fa0d813f931729488ba0fe0654298f2e01984b68a164745630b1c4c8b54263d SHA512 f03bab1beb8e4b14715e76044a8999ec66a3baa266bc1e725a1a02ce6d28f472cf86e5f127d586c1d9bd7cef72ef4d258e00be923d52aae750c145f8c0ce270c
 MISC metadata.xml 334 BLAKE2B 089a7116fcde8065143cfbea3f87f29e676572c8ca9b4e6f2f12c613e7ed58a14fd611b1d55ec8ca3076e2ed852a941dd31b83988440031ad4c338f5b34ed5a2 SHA512 a1b63c4ed0631ff2762219e836519b753840e847cd79423eb14a84b2617fae29b0be16b1dac30c3a8c4589fe1c027c06a2fdff3f7f23909d8b7913b057736623
diff --git a/app-office/impressive/impressive-0.13.1.ebuild b/app-office/impressive/impressive-0.13.1.ebuild
new file mode 100644
index 000000000000..298f8cb868f6
--- /dev/null
+++ b/app-office/impressive/impressive-0.13.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit optfeature python-r1
+
+DESCRIPTION="Stylish way of giving presentations with Python"
+HOMEPAGE="http://impressive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN^}/${PV/_/-}/${PN^}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/mupdf
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	x11-apps/xrandr
+	|| (
+		media-fonts/dejavu
+		media-fonts/corefonts
+	)
+"
+
+DOCS=( changelog.txt demo.pdf )
+HTML_DOCS=( impressive.html )
+
+S="${WORKDIR}/${PN^}-${PV/_/-}"
+
+src_install() {
+	default
+	python_foreach_impl python_doscript ${PN}.py
+	doman impressive.1
+}
+
+pkg_postinst() {
+	optfeature "starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
+	optfeature "sound and video playback" media-video/ffmpeg
+	optfeature "sound and video playback" media-video/mplayer
+	optfeature "extraction of PDF page titles" app-text/pdftk
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2d75fb6ff09f..fab021737b6d 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 4baa9e1a9606..ee41ca6d91a2 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -2,6 +2,5 @@ DIST repoman-3.0.3-unit-test-bug-779055.patch 4153 BLAKE2B 80dd075ca2930f5b14be7
 DIST repoman-3.0.3-unit-test-bug-779967.patch 1205 BLAKE2B f8ff8f98031dcf93ff2812c2e5416d6f731adb948dd8c62304443dc401ab0c7e21a25d59a951fe3ae35e417cb8e0badb2863d97e6d9ff6cacba4ee17054f2dce SHA512 b82ec000d73e93949aa7150005556cff9c4ef7ee11a06b5456af375ea7cf81985f91b0a152d40767a1cd768f30cb1d155d01adfe0e15ed49c9f50ab03c33b808
 DIST repoman-3.0.3-version-bug-779508.patch 1887 BLAKE2B bc3a49266fe64d55ec95537196cb4fd3881bfdfd2a6bd30bc0e55ced674d4a12688264a3802f3f72ac291c108ab1d81c45fd0571dc0f2a6b0af8a05177d873b4 SHA512 75c41144e18833e7e46aeb9d57ea4ca29019701d5522be827ea28db2238baa6cf0b220461aba01bcfa7b42d979e2b284613d76a099f8a34eedd62d619df82dd9
 DIST repoman-3.0.3.tar.bz2 90373 BLAKE2B a4ea542c452d44b1f4aef235d67390b0a0f139f32da33ab9ad8992797965724f4ef8123a49b681e9205b6e3fe279dd248b65b0119659b7a0038fe9884bec0797 SHA512 09855a8a0098482c1ce0a7f50d2481528e713fb6796a4004475c841de59f9df8d264f2e9342fdaee87c71d275137234b7e3adc3454f7f33dcf75e32a0ae3f0e9
-EBUILD repoman-3.0.3-r1.ebuild 2638 BLAKE2B 564efc81ef162f1130477fd6d15613e60904aa9f2d113cc49b550d48c1cae40a8a83f45c40bf124bf4b3a378c2601259538d52b8e5cf4132f64436a838da8f9a SHA512 7f4f06ac07c0ee1c9d52318d5e1d5709dc0f63707bb14b1fc57734a2fbf30c20635f0a8010b338ba93379f2281727ca96a2b5a4067f135760828f2a0108e9b93
-EBUILD repoman-9999.ebuild 1986 BLAKE2B f392c8de0be23a3161eb0141afb91d6669b050f83835b948283f6dce6d367a0cd5f1a7d5f27484f07915fa6caf1313d30a60424330703cdfb46715af32c4538c SHA512 7c3cacbca70f4660f5621d8227d96920c1b8663adcd45cd18f04781e799d910a6fd6e16cc50d606b9a68a84c6d0e9b2e2a39ca2194bffce346982b5a120fb8c9
+EBUILD repoman-3.0.3-r2.ebuild 2682 BLAKE2B 3a78d7007bbd8b790d32fe8f85dbf7b67329e144593cdabbae73d1f662d520746effa3e281a7826e6f1264dc7e08ef13638fcfc61d76621cfd9344c1b0b8b9c5 SHA512 502d6e694b2599c575edef90418f352b8f258efac3ce396cc9240d2f1e166bbe1de5963fd47f041853b525c91fc56affc5d77bf9abcc422464b30d1673a63dca
 MISC metadata.xml 473 BLAKE2B e115ce6e127efb1578b490ad1ef7972faf86ce41db82aed02cf5a4be79ca33e3734b95fd46e599039a02fba8cfd7bf33564c89f4f31fb6fddc53165c945612c2 SHA512 0cb95b5b229551e75cd5cd0d2c0ee731366bea0070a975c4e3f0af9c7658fb0165758dec51c6223474beaa6d6dee746581ab5da2457995a1fe67ebabed60d235
diff --git a/app-portage/repoman/repoman-3.0.3-r1.ebuild b/app-portage/repoman/repoman-3.0.3-r2.ebuild
similarity index 96%
rename from app-portage/repoman/repoman-3.0.3-r1.ebuild
rename to app-portage/repoman/repoman-3.0.3-r2.ebuild
index 1a721bcc7e8a..13f7e3218bff 100644
--- a/app-portage/repoman/repoman-3.0.3-r1.ebuild
+++ b/app-portage/repoman/repoman-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ IUSE=""
 
 RDEPEND="
 	>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
+	<sys-apps/portage-3.0.31[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
deleted file mode 100644
index 0ba9ff39dfda..000000000000
--- a/app-portage/repoman/repoman-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	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"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	unset REPOMAN_DEFAULT_OPTS
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 5b79fa453488..11082d609e73 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index fad530ad1f31..5ef0bbd9e581 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-zsh-completions-20200914.tar.gz 25823 BLAKE2B 2a4af0fe85819f5cb8b3669f5a3b5b0e9672864a1562641c1760b7fa889648d3b405d5e28fd863bcea7800faca3c7392ecf3c5169755345bbf75d17c996c0de2 SHA512 a7f65e255a3c9f342d266d3a8604645c117124bd3f714d90aa63b3f6f873a4cf46224d7a9969061fc522107139b97695b8bbeb8a6dcb360f41128079adf9ce8c
 DIST gentoo-zsh-completions-20220112.tar.gz 25839 BLAKE2B 3cf9a26e14556520ff32172b0e97ee5cb5e3cf45569c97b6f3e701330490be831f211dde327fdd007df9b67df22c243f4e91e0f40b9d4d02551b0b3059d60708 SHA512 b06aa69348b0954b8cf635170fa743960e5d4c3988c0dfa6166e1d4d33bf112e24d1e28bd5a0b228a0d6e78509a8e62954217bbd30c099d99cad4ebab71b328d
 EBUILD gentoo-zsh-completions-20200914.ebuild 751 BLAKE2B 18eb81e338b08ac4ce88cf8d22dbef751607eb7f5e03972df1161ebcbfda96e2feb18c6bb2bad5e1736e30503c5ee21ba6f73e60c740731877462bd78766f46a SHA512 aed6a0ed814b1e296070b4e439045ce4e80fa0a0148c3700c581255584faeca26aaf2c5c72faf494846b27bea9f3eeed8fdc68ac2a43f84ae751e4244807c7c4
-EBUILD gentoo-zsh-completions-20220112.ebuild 765 BLAKE2B a8accc79159225623d0edfc1d22cc3114b3cefb11b98f2f342ae12d584407a5b09c0fdac51473268d6525d0615a7ed85e0ddb49ebea41124124503633dadf0ce SHA512 1f8d028b97def99d1b9df76c63dedadcb835c80770f1786ecf353bb82f67755c3579e9e4623167c6a7585213d0b96ff19013d843d79b1f1b1bdf7455bb7b6dd3
+EBUILD gentoo-zsh-completions-20220112.ebuild 763 BLAKE2B a5ed9da1446405a0207b903630c6a1bec71b28f3e211eb6fb0ef38756bf23db28e472886b170fe4d37f82b81a7cf394c28eba52ac0f40b71030e9017edd9b34c SHA512 b894395284f0b480cacbfe0e9f2c45e623223c696e3c67a172f9668d78ab66e67a2b23f25cea128069e140fc9c8442cc2504465ab9e67c645a23860f393c1d6a
 EBUILD gentoo-zsh-completions-99999999.ebuild 758 BLAKE2B 653680673e77cdee924ad8d1ddbb5340ba7b3259dd1d88b9b02f7ac5a7ffbece59aee3c38bae6d1c448ea3aadd8a473539ee1e53455646779896f98c249d92ba SHA512 9fcafe9b244ca5a759ae1eba5450f6ae1c93280738ecbf32942e2823225d287b1650220271d6296f7b102fea8370b1958bd84d54633c287cf25f20255c3a0429
 MISC metadata.xml 265 BLAKE2B 366a03acdb48a1319610bc517389f160c0f155b3c44d692769394a57921eed5736140e933d161e27803289f8c61c6444bd982219287899f292295e2cb97d330a SHA512 de46f8457349792a0c31f63c3af6a0e7b83ad01e68842326c24a700204cb56dd10fe4c1884e993b8586cc40026c12963744b051a5d6fec560912e716cfb7096f
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
index 268d2cb1f118..2946462b6341 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index e377b88d5107..261c6b1568c3 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,5 +1,3 @@
-DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
 DIST push-3.4.tar.gz 2839 BLAKE2B cc7dcdb0208b1eb9d36963acbbc1e0c852c4164d5ba2a35bd52848338bab7f66073c9c780c82e28b3f1bdd55d81f26f5281694ba76214fd7631f946e0fdc199c SHA512 aa118f42210b40d790c0b274045ff45c2067cf894731228f5065eb44a723fd813549204797c365329f409e36f564ec22f6d956341b1f2b62964b918e76991344
-EBUILD push-2.0-r1.ebuild 621 BLAKE2B e39739ad26722cbfb26638d9a896f84d3edc82968c9ca181c165c9cc6cfa025c043d1acc2f6051ad3c16bcf66d960c5eaf7ce7ae031ac6d24f0fe755653d1269 SHA512 604731f23b1d82090668971c46030e31c891e049899c87b8d5944905e9ca47e03c8e06febad7847693e406410d93344d823f11e82a8662e3254d5f8555dda214
 EBUILD push-3.4.ebuild 645 BLAKE2B b4ec1a727489729476b1a32ce909e74360b9b833d53ab98d055c3c6f8c74f8779073e440d8ef2ccc8e2fefcb288158e324873581b18ef7a3bbd4376df55688a2 SHA512 5655cd8a396720f8650add55874dfa01f38cfb06e8c7af014a15a3a89c14925e730f8607ae89bd42d10cbd2a04ba3678f8a25c2cc66b3d395d6d0178895495e6
 MISC metadata.xml 738 BLAKE2B 51c77214d55a2855cf33d25a191c51638fbd34cf4fe9938ba4395ac00272dc9da820ffeb0a8b356bb7a051bddcc1d9d9bdb76ac1f33cae56b1efd70db2dffe5a SHA512 a415c3878bd94c10d242f8ad51820793cbdc7b5103ba7e2a6c6c47674987ffbda48604122893c5ef8a7f754ccdf53e9b7d5839e26b27773dbbb7d570fc502bc4
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
deleted file mode 100644
index 0b0c030545bc..000000000000
--- a/app-shells/push/push-2.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
-HOMEPAGE="https://github.com/vaeth/push/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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 ~x86-solaris"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins bin/push.sh
-	dodoc README
-}
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index db128b6e9766..17f0ef307569 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -10,6 +10,6 @@ DIST tcsh-6.24.00.tar.gz 949411 BLAKE2B 0751707e233fedc2b8a9360f27e8f4a3e030956e
 DIST tcsh-6.24.01.tar.gz 949438 BLAKE2B 4f3005e98d02aa12cea41405ab7e56cd840ba207d36a657699041b045f537bfbf1c992a20435ee97ea21b4bb25f0d7af532ccd2ef50de8542ca94f914e3f3ca5 SHA512 47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.22.02-r1.ebuild 2872 BLAKE2B 48fae91fcd3e0af98f819c087d392492ddf13d2bc039da13ca20153277843d2b10d507cf341b48724068c88cafab62006acfc779c37ee9be85e4df49b4b14481 SHA512 0a9bff60df36fde3f96a7ac607bc25669558956a2bbb820c329e8d20d5f015aaed5ab843161b43780875a6ae2791e2833151fbfa7f361758ab2a9918b56a3af2
-EBUILD tcsh-6.24.00.ebuild 2933 BLAKE2B 1146b371aeee2bc2ae3584d22b4a6fda8867e3a485b41bd20750def555135b7333627a7aded378a004f5d3292ab44bcfc845598c77ecc43365ed0e8445516f44 SHA512 b81b4ea4a8b4e78c401615f0271904ff1c425f3a47287f649a1a06c3b8e6186b1af6a7fa53ffe591bfd67f563ab4da0050aa5e41931ade124f756fd5207f7b68
+EBUILD tcsh-6.24.00.ebuild 2926 BLAKE2B 4f7fb027196534939a3ce4c1197681d34f1612be7cb7de7b415899e789086be477a6c672c59b7ccdcff8b9fec1db192b81c6c31b3d52c193eb28d01893589ee1 SHA512 c5f75461dac0c4d66e2c201a6f91b3c3801c0249b0505069dd6426a3215ae3933caec753e87983391ac5318cdd9e635cabb68a84f022e360d5e6c71148153400
 EBUILD tcsh-6.24.01.ebuild 2934 BLAKE2B 7f07a4a7c5f2a904e2efa634c2933c420c19a0e9623404bc42aac291f1e435ae57e48700ab7635eb6c4f0b1318feed56ebb387d60e7bbef9cf06afaaeefaa504 SHA512 43c4a3b32def08a7f416627aa8a9455bed406519b934522a13aae7cdd222b27260c9ff21ecdf93aef7ab5f1cf37afbb604f362cf9ce4edbc8f5254df7589bc3d
 MISC metadata.xml 646 BLAKE2B f385f17c96351f51f3af740f46d37ac3321ea24c47db71a96f3fa840d9bd62dc39c3d22a0a0373ad004b5ab28cde8b641c519c3e095e90488454e5e2d50bedcc SHA512 841bb759cdaccbef3723f80747aaf5a1d5dca5517edfd0807d38c36dbbdc09190431ce62ed521dbad674c05866fbbfb616cd607ad29204c3ab243b90038e5c64
diff --git a/app-shells/tcsh/tcsh-6.24.00.ebuild b/app-shells/tcsh/tcsh-6.24.00.ebuild
index 5507e8c45b9f..c97fe7fe2c8b 100644
--- a/app-shells/tcsh/tcsh-6.24.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.00.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d057050df497..6b11fc9f313c 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 4ee24d068eea..65ad01a2ef77 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -4,4 +4,4 @@ DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb
 EBUILD convmv-2.04.ebuild 697 BLAKE2B 6c6c08b7b1bdf528c13ed5c2d540496f1ef75819741558773e50b42dc43397d8e2a4963e2a090be49e05a010c7395be21ad13a5ea80ee9a66a1f8f8fb00eceeb SHA512 473e677f1ec5af80737d13ff7cbb0d38356aabf3ca3305385de87840406453fc9aed83fae879d254c4740b7425c72d452ab70e66d77e0039a9ece2c3bcc4c23d
 EBUILD convmv-2.05-r1.ebuild 808 BLAKE2B f047ed37c8b98470f34b2960e0e0a9dd1fe45ef59920e5a4648ad41d49d947ce1be2eaec77fec003f9bdf12ceffd2c1894eb80effdd79b1fca908ce2ff4fbd85 SHA512 1f52846d6ff72002b7442c356f610ecf7c66f60620fe26e0f2627b81889a42423ce1c70c338f77ae556c32d4e563ad311dffd8bfb60b987c69f81029e5fa44d5
 EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+MISC metadata.xml 259 BLAKE2B b686159b165bb65001fec330015f34ab32825ba2b95bda35f433702b2a1b687120ce9de3a181683886cbb3ec13863099e02593f009eee89b0bb1125dae93bcbd SHA512 191845ae8df52119a9934c6fd23f5b9ce8d2c77df29c750790d3ea8b6af37355b69b5b24fdeae3bffe7f5ce4f8997e7211008dd1f36e7de0ebda3a87353c0dd6
diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml
index bef24d2c2337..ec151f29d1be 100644
--- a/app-text/convmv/metadata.xml
+++ b/app-text/convmv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a5ea3b940d44..ec267df369c2 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,10 @@ AUX poppler-22.05.0-missing-include.patch 518 BLAKE2B 7ade72f27a3d0b9fd32fb83113
 DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
 DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3
 DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5
+DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
+DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
 EBUILD poppler-22.05.0.ebuild 3397 BLAKE2B 69946eb58b8b7844de29734e327cdc8c912fa535c3281f908739e68901fc99ac6ca92c437f771bc3e328fcd48fb76b522146941f76df9fe414fc8305d8b23c86 SHA512 e1130a9e67d32e1fe3052c8fa9dd0f43c96024c69cb6ec44c8a103c8fcd8b98d7e29e7f2ecf05384f6bf582f0efd8757d04801024ec8d284f752c5f1b0d873b8
 EBUILD poppler-22.06.0.ebuild 3627 BLAKE2B bb1ec0745496495ef86d376d2d1ca6982a5a5f94a7976fbf7c62305e0e02dfcaa2ca56c6f615e10607379ca28b2779ec0405202232257cf637519707691159dc SHA512 39d1d7e26eac8e3bd11e089d5ff44ad7ac0d39ec2f0245e831b59cb8a34c9d533ff25ea343aaf3ddb83ed867b6f5218897540ddc943d3df7341ca539940c6da6
-EBUILD poppler-9999.ebuild 3628 BLAKE2B be29c55201cdf0c4e31a77538984b0057722b464f548903dd07ff898b9276c4338f0a27d98c8f9ff825f6c07f1fc4a62b761f38ace0a5a3eb6ce5db477744d88 SHA512 f8b03fd6a733bfde1faf5bb8327d952ef8134bf773c1b9d7034b06d88b8f02da247510c84e087fb776701c4e6729b7767b30264b0e5227a785a7563db94f3148
+EBUILD poppler-22.07.0.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
+EBUILD poppler-9999.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.07.0.ebuild b/app-text/poppler/poppler-22.07.0.ebuild
new file mode 100644
index 000000000000..cffe79567ee4
--- /dev/null
+++ b/app-text/poppler/poppler-22.07.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	media-libs/fontconfig
+	>=media-libs/freetype-2.8
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 1e336c95ce57..cffe79567ee4 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -15,7 +15,7 @@ else
 
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -28,7 +28,7 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
 # No test data provided
 RESTRICT="test"
 
-DEPEND="
+COMMON_DEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.8
 	sys-libs/zlib
@@ -50,10 +50,10 @@ DEPEND="
 	)
 	tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	cjk? ( app-text/poppler-data )
 "
-DEPEND+="
+DEPEND="${COMMON_DEPEND}
 	boost? ( dev-libs/boost )
 "
 BDEPEND="
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index ef098e18c731..9861e7830f56 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,6 +1,3 @@
-AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
-EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
 EBUILD t1utils-1.42.ebuild 542 BLAKE2B 78c6a5a00b3b177744434ba10111082b46ebd8e136a89d9ddd56a888a9f9d586180ba7fc316cab810c21036755663072d482cd7ae789b263ece81873b6bd73cf SHA512 2de00f97e597e2c1aa7bb89db448381d5155b178c01dd781e60db94bb6da88e3b66573c1e76b37745b04d615f63b082d9b2d0b70bff8511928e17f6395a5c197
 MISC metadata.xml 348 BLAKE2B 6bfc533631d2566e3ee69cd2984da33fc89afe690b4501ed2a1e40b8f961fde4e9049f67a3a32de0cfb54fccae798f29c24f86c3d57854ddfa904bacc275d702 SHA512 b329f25a743f60cacddf37ab7ec8c22cc64a2bf06c02f3115e46a80974a761e456d8ded059e8a8ec09abcd8653a16e6fd81fcf2af7d11f3c479716d69f556fbc
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5e..000000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date:   Wed Aug 16 12:37:34 2017 -0400
-
-    Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
- 
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
- 
- 
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
- 
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
-              const void* needle, size_t needle_len);
- #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29f..000000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 614147cc1f78..c80186287d49 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 868 BLAKE2B 0ac7ddaa3e76beb71c015caee820e09d484ffd4bfcc96c40213f3761d0e7745ff2447196a69439451e3f518022f0c20c46ce28be0a2402c66205173b9c24515c SHA512 2c382c2869049ab9881283b90814c9352a2a707a54e53ab924a5eb03d1c747c88606b05e9b5182fbf8fe68dd5ac376c0e9917f5e74a84ab7cb88770d634e464b
+EBUILD wdiff-1.2.2-r2.ebuild 877 BLAKE2B 4b52042a689f1cff350530def560e77363c5be4f24299bf337643069266dc9c6d6b693077708e9b3d9581827d69c0b4c25935901665ecf78a494e122662988cc SHA512 d1a7c44fe9514907f5487d82f6db161e7a7e16fe94c03195aa6286443c399ba6a88e88bc42a658bd3191f056091f9dc124dd7e4ed6b2b664df42232a52f333f5
 MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
similarity index 85%
rename from app-text/wdiff/wdiff-1.2.2-r1.ebuild
rename to app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f14..4418e21d3f05 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Create a diff disregarding formatting"
 HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-apps/diffutils
 	sys-apps/less
-	sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/texinfo
-	test? ( app-misc/screen )"
+	test? ( app-misc/screen )
+"
 
 src_configure() {
-	econf \
-		$(use_enable experimental)
+	econf $(use_enable experimental)
 }
 
 src_test() {
@@ -31,5 +33,6 @@ src_test() {
 	# when an incompatible screenrc is found
 	touch tests/screenrc || die
 	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
 	default
 }
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index f3ea2a06d67c..019ff5759166 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,7 +1,9 @@
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
 DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
+DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
 EBUILD xapian-omega-1.4.19.ebuild 1186 BLAKE2B c88384367fe78df1e95d61d37d5d234234b7b02fbf78cde7e18ab094c6107e8ebc91279edd54f3edf5239c8c39239006cb6cd3d61e7218db0e8b29c5a1819478 SHA512 e0b12ab4d578ddb627cc3cb874da6b81d43a27142aa33ba2460482b630f2317e456464c87c44cd1ec6ae52b31fa98ab80cf63fabaccf23f8664316d338de0b88
+EBUILD xapian-omega-1.4.20.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
new file mode 100644
index 000000000000..91ff25791e25
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-libs/xapian-${PV}:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index cda020997da4..f72648df0522 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 35beb0e22640..9072a2d267fa 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,5 +1,7 @@
 DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
 DIST folly-2022.04.11.00.tar.gz 3632587 BLAKE2B 13820f6dc600727fa97603181be97a568cc8b3c713659717592853827dac050d5f1f6d98178e3054871233b48ac18f713589bf43b36ea29445cad557ce13bacf SHA512 7aa0be95d6f8b21aaa88558cf5921c526ab5a8c8121b858eb6e7ea19946d7a82dff06d90b7a365cef5c56a43d8d57af8d01b8b11b27262fbed9ee8c9e701b5ac
+DIST folly-v2022.07.04.00.tar.gz 3647988 BLAKE2B ab8916ff4be1468d44dc0892126448682554ea95ce879166f457b621c3157cb22d0292fe2c58744494efe0fbabbf77732184335cd22244724c740910cf3a8303 SHA512 11fc32768539d8d42c7396eeac522238450617c8dde302b45c64bb93fd6ceaef7bb193b897802962782e8211c3931d31bf8df68e06741ce855d9725510677d7a
 EBUILD folly-2022.03.28.00-r1.ebuild 1486 BLAKE2B 629e5c21603de6a7e91532219f357f74df50194e21102c6f2d05e6d613bbecdd5fba2f2042bcbac0dada2066b82def374c671d9c7b263ba3f1f3d16178496dc9 SHA512 2841732188df3b1330ce730aade4a15272208fd16d658c15a29b908963dd8ec1349205cdec2eb218d9acf539043db011498375f248f580730495cee2484a0e96
 EBUILD folly-2022.04.11.00-r1.ebuild 1880 BLAKE2B 9bbab33cb481558b9f857eafb813901fa0a3ee9f977772f3d733a49b9e7c2656fb98ebd402f3f0d877e20c547f31e2ebdd1e9a3b234300e104858aec5e49d1a8 SHA512 aab53b44bee8c2a4bef0d5cc0dad9603f0a84b66db02dfa9062676e6bd97cb25fc6593dc2aa1881ab6cd3f5477f369717d0931e670447be3eec80e0161a5b98f
+EBUILD folly-2022.07.04.00.ebuild 2243 BLAKE2B 0ce26c96eab6ff1797f9c6d893ef8dc7c7a7ceca3cecefcf3bf122793aeb707403a628803d0073a1ef3c29a7dea4f48534dcd71a25603336f31883fb485828d7 SHA512 8f48e795fac9adee9ea2483b9ccdc61571c40cc456f5255777b68e2c9aabee3bf6dedc586c013dff9efa7cab93de8f8450fbcbec70003ccbafaf3196a1c414f7
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.07.04.00.ebuild b/dev-cpp/folly/folly-2022.07.04.00.ebuild
new file mode 100644
index 000000000000..e4b9470d848e
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.07.04.00.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-libs/boost:=[context,threads(+)]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	sys-libs/liburing:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="test? ( sys-devel/clang )"
+
+pkg_setup() {
+	[[ ${BUILD_TYPE} == "binary" ]] && return
+
+	if use test && ! tc-is-clang ; then
+		# Always build w/ Clang for now to avoid gcc ICE
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
+		#if [[ $(gcc-major-version) -eq 12 ]] ; then
+		#	return
+		#fi
+
+		## Only older GCC 11 is broken
+		#if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
+		#	return
+		#fi
+
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		#ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
+		# Long-standing known test failure
+		# TODO: report upstream
+		# - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
+		# Timeouts are fragile
+		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7bec90f9a649..3b19931a1c2e 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ff340205ba12..89ec52dd8400 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -3,36 +3,27 @@ AUX configure.ac-7.0 1523 BLAKE2B fc05fd3fd13bf192d2a52096c89bfb87d6660c19b9c88f
 AUX redis-3.2.3-config.patch 1495 BLAKE2B 9f3c04dfd97845dcd364b75e2e5f543bc40ec0221a5ce19ab3c194e55ceaf24f13c307276f616d9a7742662d9e4fa76152c7036f7728f787bbac55f2b1a00999 SHA512 d71c918ea4952ecb55cc4c87649745ee468587c289d60bd1bee87a2948a6e882d42afe36bb113392b5aaab17d315732cabfc472804204d3a043305a5488a4124
 AUX redis-5.0-luajit-2.1-fix.patch 1885 BLAKE2B 290cf1ad1e01fd8b1e57b972822a97eff224f4540ea09e1e2d80a72d26a40e1861c2bb386da3edb1961a413e73761553286bbcdfba8c064ad74f22748bb3999f SHA512 79147fdefaee4e5ed508299274856cd42e817c73a5d055ec4d6ab03c7b9c1f57a62b9651ffc3173d795f05e39827c88fbe41b9bc20355933150c6a549738b1ec
 AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1
-AUX redis-5.0-sharedlua.patch 2642 BLAKE2B f86d3c932a8c0f05e2d65725037a0780152b95835f88395cc74765902c3184a4e1ed0a3802f54345e91a70b6ac013419c6d3412df8fd2397ed300ff1e7210724 SHA512 971944ff03563bcc91c9f29316af2b0eb691c9d0e27d9e4f3fad30dc4e4afe34c077ccdbf5f93ebd78ea6571f809a801721376059780a30467274a7be5ca6425
 AUX redis-5.0.8-ppc-atomic.patch 495 BLAKE2B a995c1b1e327416705151dd888b98fe02fdea8126359f3ffa2cce4d5794d7677ffc4dc7f628d076bc0ed341dac4010ffb9409ee25113fe9cac2298658e94802e SHA512 f4f2c2aad5d09e9fafa58946fdc79aa49d8f16ce6d389dd653522295dc397796c58c87f4fb92016af8c261aa4b00a7eab09d33a19eded496807444d234a9abd9
 AUX redis-6.0.12-sharedlua.patch 2897 BLAKE2B 10a23bd3b2fab8b1697a2d3da55e5e0776f34a02f3f3ceea24c76dd95b85d2fa1751b69c67aceaad0797adb4d0375a6826698f266c095d525864645901dbbb55 SHA512 302569a9d626c4914719a0d4b5608809e236a55935557c74f7beb2baae9948329176672e04dba28cd50c0ecfe1115432a268c461c05f54d0493168e701c6a622
 AUX redis-6.2.1-config.patch 1477 BLAKE2B bc87272e52b44fc58e7e8b08b5d97e53c9ba22eab02f89c3803d02e526c6c5eb1df5d1565021d96dabf8b9936dfc0b2c27c9dd148d1968d98d31d10470687741 SHA512 da2a2f4321fc4f5fef4db1e399bd6a011c18a997b28c4355ed4284d07c24a5038f086f7dcbb26d4534d800baf9be0634cf53466524a8323d16ad542042d89d98
 AUX redis-6.2.1-sharedlua.patch 3010 BLAKE2B 5d7863b4916229dbb20fd0a852557afefd9b8bcc097ce6aec6cb6fafff08b2428848b35ea2a0ff1ccd5195f14b812f3710df500a6d9acb74c32937d620a3a5b1 SHA512 2d9f78435c8d1e5e284e7410471dbda11af776816d824df20c8b3de9763d06ce0be4d9f62111b1195fe97c42d1d8ff5f2af0d75296f9666137579374c5b1bb87
 AUX redis-6.2.3-ppc-atomic.patch 465 BLAKE2B 9324bb198f03a3e5043986adaac170f30f378f5835a53e1c749ccf3392edcfecb22f4f7ae2b325ced3b06bf20535a243daa138073014a109e6e54b27d736dde5 SHA512 803ea4e1dfcb2f87187a0294051bf91f4e67a9b7de421dca20fe8b574741dc454f83fe1eadac7a4ef5d29b7a707a9dc2a56479f8d86c9e82de6332b21101456f
 AUX redis-sentinel-5.0-config.patch 706 BLAKE2B 0fa0166bbb3460e783e85b90acf4c606b83e271d8e9828bb5b3a39b623508b21dac33369ac25b645169271822e9c5deb6ea7294e40fc8d1a5ceec5129c174505 SHA512 2dee5666d50fc5d9b6021735a95c9a9647ba99c562e348785381d5a05f1388c3fb9e8c4a15b0de771cf73fb80e5e29f1df25805df749457a2ce4f2e3f2e0e9e8
-AUX redis-sentinel.confd 470 BLAKE2B f77fd7e35c753e35aafa6e773dcc00d2779bc29d8579334078bd6124aab436dff671ae790c0b0e3cefdd4082fe212b4b71501b529176cb0a1e5f8c8cdcf1387e SHA512 ea455f8c73c21bc46127ea5c7b99dc5707ad41160e5fd61367555dd2e3fd5c1518026257651e7d371a60a64b682b6839dd37580f75308c73239edeba49d6b372
 AUX redis-sentinel.confd-r1 476 BLAKE2B e06aba8c65637a02dd7c778e7ddeb1ee8f25abbe24cea6d9ab90aee0ab512d36ad342dc4aba73c792533c561a00413a6432c6a635246e2fa7f44d2c4cf244972 SHA512 be2bdfa5efa5c55294da382e0d648c06788e77df150acbb2004ac3fe88d8545992787df4a5dd585e5e5fed9a9018e55e03e5f048601d5401795c37a476232c9f
-AUX redis-sentinel.initd 648 BLAKE2B eaea4a047dfa61a325fa2bfeb30b422220d4fad699a693b9141a74575dc153ad3db2dafa3fa06ef195914a32f2a6aacfb3fc2e3b80ebe6b75316700fbd84221d SHA512 dfd1dadedf9b7376667d1966072c28e5e23e17592bf66753eae4bbc084225714f30c6450001f643c1561ff3a2eb2e50f719d32ff34f5419040ff42a2c4fbd70d
 AUX redis-sentinel.initd-r1 654 BLAKE2B 064f7ac04ead49052aa221d295067df5cd23081bf7a65546d680281eeb4fcf0fe42c4d756917b0aa05f110be84b142d23410ba4829e1d82725826f788107f235 SHA512 b483902f343a52a4f285d7aed6a56c3bd8e820eb5f3e8805c4bd93c0df009e944e6479fea6060bc07b493d655d995ae8e6f91548c2e512215a5966abdb0aa6a6
-AUX redis.confd-r1 511 BLAKE2B 911e6f7ca70013d4feefb6ec7ee3f98220f303d48c95f27c2558efee00559cf2b9ae8c0303f85d2b081aac8f636de326b52e3493a9be2c027ec7d97114f856da SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133
 AUX redis.confd-r2 517 BLAKE2B 2b1834796373e28d759058f2867d88d506d1b4ca34f143abc38b4fb55c602dab44aca9ecbdb5ddfb7fd2400be1d86108b7521d6cbedda5be73eecf48cdef73de SHA512 64dfb4d4de21f5415cce1b031b627b9d42b10b10ad4de6a5f60b9a617f9e688b449b527d34ce9caba1c4817ac31246a684ca15e2b04e6d9458d5e59cd739fc09
-AUX redis.initd-5 696 BLAKE2B 11b2a50a74c9aea57b01ee7be7d3e1d70ca21db994c35b6d386115eb4f9c329ad6f77b80ce46c17e026a440e532e976c3e1a1f7c550e9f50cc812ef557c5f8d9 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d
 AUX redis.initd-6 701 BLAKE2B f2e47fa903e7f397250435c215d33f9d63766a718c2a045aa0d8744fb9ecf2b9824a6889e75c2ee8fa0b88e306a5f9b6e12cbc07699a66fe88b60712e330fd97 SHA512 d755f797905a233315f162c674e2f83dc5a629eb6b178d1de17af6080565a021c2f6ee048cdeeb06d8baa5a741b3bcc408c395649045aef04f1080c44ebc776b
 AUX redis.logrotate 105 BLAKE2B 1281fd86d399b40aaaa69d1fe170b2c49523c074e14b12907428b676b03d510b680363dd5041428d5fddecb91a510baf53dfa57df66d697ba4846f1e49ab59fe SHA512 9cbd27732c7f8270bf9b8563df0964af142d1ac4e97417e495fcb02e730e93fdfafac9370188a2fce040d55d6c3704e284a50b6300616a3f13a03a6e25c1ae49
-AUX redis.service-3 249 BLAKE2B 92a6914601fa9b587f439e5cb30c9b00ed53d6dc9d18f7ca8f34075f3d77836b82018baf3d6e46ad27ab90ed5de5a553fd5ffe4305afadb7b173b56dcb328de3 SHA512 5af7d61282e90e72faa8b328c11c70bd2cb255265e3a29c4f2208795c4876a08f9e01cb473d2a537362ed0b282b22aa51612cb95e192f96fa9a7b974a99da369
 AUX redis.service-4 255 BLAKE2B e51cfbb7ce6586e7c16003e3b470be036e9c28b408c4ad71e90d084f5ee843eb2b0b60552735099564f99fc4b4c318980f2e1dde7ac69b32a54a636e663a7cd5 SHA512 786fb60e628146d5024fbee2c17bee26276f58b8d2f15c8eb0a416b1b2e870a1d82e7a1ef7155b7a489da8c89d6feae5b1207597bf6fcb929d7bcfddcae25937
-AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15700cac329970f351cb9b9377aa82e6f4dae377b00c1710a1e0f54334f007cfed64551f761034d4 SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738
 AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d465ce097765308c7b7ea729526404120d04a79b547e865df93f7bfce1e63341c73563496f1dce691 SHA512 3de050ce044b7daf71219ec61dee2bc31acef161319b87ec2963b23c72e8a4807f1302c4932897664a63ef94507449f6ab75ce18d59f5e1a4558c330a7042e43
-DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf
 DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845
 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
 DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db SHA512 e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4
 DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571 SHA512 bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0
-EBUILD redis-5.0.14.ebuild 4838 BLAKE2B 2c43196d200f0ca86eaa5c29cfec20ff717726d572402ff8a6afd6dd660edb7b5716a0fcf58fa960365802d837bfe5d0bc96f18144517b82afac1f264875f59b SHA512 a3df8b7b0e00199f67801c711015ea9b415903dce574b4d119c74201aed28d9f2afd81062c12b33f3770380daef250ed8c51125cde98a70f5ae63ad534e6f855
 EBUILD redis-6.0.16.ebuild 5642 BLAKE2B 72f2aea7b428ea59a05d51f8f10e7447408757f3cf322cd2d37ed605812816f135baac4507543254de0d1f3d89a2da9d261d2012b6c3805b4a87fab064465e32 SHA512 1f6c69e96eb98e4389d55cee8dbd40ad0cab84aad60edc65df2b940968392ed052a489ad25662e44a5c14a5c878f08b2566097d0c20c200f8c74b0b2d5f327ee
 EBUILD redis-6.2.6.ebuild 5398 BLAKE2B ea426c3c1f29e7e471fcd0435dd494713111d63d585f870e0d6c86e662e4023bacac5134c95c52ead1fcc3a8886db83a42a2f719fa035f46dde3dd333c725c92 SHA512 2b066233d5211973a19fc7d7c1d01892e818a560be746754166dcd836c46c370a61e0e92592452345c98d00dd455cb9af6bd2eff0f6375d9fcef15e46e433b1e
 EBUILD redis-6.2.7-r1.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396
-EBUILD redis-7.0.1-r1.ebuild 4782 BLAKE2B 4e60b40cc5cf36eaa596535c977c0cd512989d7d0bd0db2c98e24663030b43197cbc82676bd80610ee340b6cf83edddaa0d2bccd60063145867b814cda231a75 SHA512 1723f7a8149284e4583ebc207a511539d90e62c9a13fc87b45d726bd0d2a92980268f1ad9b643ec4054ea64e42e9ac32aa2bafeb1327f4fda9f2633e78aa51b3
-EBUILD redis-7.0.2.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7
+EBUILD redis-7.0.1-r1.ebuild 4829 BLAKE2B 5530e81a11e62fa3118c7d89a956483856409527d0d28d48ed05dc05996c36389ae9910690808fe1e74e4741852c47e48f36ec23357988821b588827fbfb53ad SHA512 69cb7349fba737e14f4d93e8b5b5f4aaf9dae13b6661e6355103ce95c252bbf624444983e2f9373c1bfd40b35303652c752b8fc8616d3aca917eb16eca450181
+EBUILD redis-7.0.2.ebuild 4836 BLAKE2B d80fa0129b047a147ecb11c343ccf5b300d3026a9f8dece4740843341f84d53b3d675090c35f75afe3e0fd5b02546a5f2ae15ac4f2a113ecf4370c4c43fdc2c7 SHA512 21d2332d96868e95d48cbebe3e9f42c433194f198db6c27361356f61927eaad0d6c3cc21a83d1b16affa40ecdf2cfbc56328682311b3e84d596b260ab2672350
 MISC metadata.xml 616 BLAKE2B 7d97d6490b18f6505729b0ec0c06fafbc8be3fb81c4f0b3aedcb44bbf557ca53c4465d0dac11e52396853e471d426b117e0d4c34407806e8bd31149e12ddad87 SHA512 8ff1a9be0ff3a6c09bb6f77cc83937c0e045ae666cec3994d9f3bf290260337faeeb2d28266e789d1812b4dc481a19afd198c0a207ee107afd2368b9d176fb70
diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch
deleted file mode 100644
index 3e14f41733b0..000000000000
--- a/dev-db/redis/files/redis-5.0-sharedlua.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c
-index c26c0d7..fa50c41 100644
---- a/deps/lua/src/lua_cjson.c
-+++ b/deps/lua/src/lua_cjson.c
-@@ -46,7 +46,7 @@
- #include "strbuf.h"
- #include "fpconv.h"
- 
--#include "../../../src/solarisfixes.h"
-+#include "solarisfixes.h"
- 
- #ifndef CJSON_MODNAME
- #define CJSON_MODNAME   "cjson"
-diff --git a/src/Makefile b/src/Makefile
-index 773d3b2..2d120d4 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -66,6 +66,7 @@ endif
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
-+FINAL_LIBS+=@LUA_LIBS@
- DEBUG=-g -ggdb
- 
- ifeq ($(uname_S),SunOS)
-@@ -107,7 +108,7 @@ endif
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -145,6 +146,7 @@ endif
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -196,7 +198,7 @@ endif
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/dev-db/redis/files/redis-sentinel.confd b/dev-db/redis/files/redis-sentinel.confd
deleted file mode 100644
index f465a5c3e91f..000000000000
--- a/dev-db/redis/files/redis-sentinel.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Redis-sentinel user.
-REDIS_SENTINEL_USER="redis"
-
-# Redis-sentinel group.
-REDIS_SENTINEL_GROUP="redis"
-
-# Redis-sentinel configuration file.
-REDIS_SENTINEL_CONF="/etc/sentinel.conf"
-
-# Redis-sentinel working directory.
-REDIS_SENTINEL_DIR="/tmp"
-
-# Specify the network service that corresponds to the "bind" setting
-# in your sentinel.conf. For example, if you bind to 127.0.0.1, this should
-# be set to "net.lo" which provides the loopback interface.
-rc_need="net.lo"
diff --git a/dev-db/redis/files/redis-sentinel.initd b/dev-db/redis/files/redis-sentinel.initd
deleted file mode 100644
index 6a22d08db697..000000000000
--- a/dev-db/redis/files/redis-sentinel.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${REDIS_SENTINEL_DIR:=/tmp}
-: ${REDIS_SENTINEL_CONF:=/etc/sentinel.conf}
-: ${REDIS_SENTINEL_USER:=redis}
-: ${REDIS_SENTINEL_GROUP:=redis}
-: ${REDIS_SENTINEL_TIMEOUT:=30}
-
-command="/usr/sbin/redis-sentinel"
-command_args="${REDIS_SENTINEL_CONF}"
-command_background="true"
-command_user="${REDIS_SENTINEL_USER}:${REDIS_SENTINEL_GROUP}"
-pidfile="/run/${RC_SVCNAME}.pid"
-retry="${REDIS_SENTINEL_TIMEOUT}"
-start_stop_daemon_args="--chdir \"${REDIS_SENTINEL_DIR}\""
-
-depend() {
-	use localmount logger
-	after keepalived redis
-}
diff --git a/dev-db/redis/files/redis.confd-r1 b/dev-db/redis/files/redis.confd-r1
deleted file mode 100644
index 1f4ff23f211b..000000000000
--- a/dev-db/redis/files/redis.confd-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-# Redis user.
-REDIS_USER="redis"
-
-# Redis group.
-REDIS_GROUP="redis"
-
-# Redis configuration file.
-REDIS_CONF="/etc/redis.conf"
-
-# Redis dump directory.
-REDIS_DIR="/var/lib/redis"
-
-# Redis options.
-# (Redis expects the first argument to be the configuration file.)
-REDIS_OPTS="${REDIS_CONF}"
-
-# Specify the network service that corresponds to the "bind" setting
-# in your redis.conf. For example, if you bind to 127.0.0.1, this should
-# be set to "net.lo" which provides the loopback interface.
-rc_need="net.lo"
diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5
deleted file mode 100644
index bfeeb6925ec0..000000000000
--- a/dev-db/redis/files/redis.initd-5
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${REDIS_DIR:=/var/lib/redis}
-: ${REDIS_CONF:=/etc/redis.conf}
-: ${REDIS_OPTS:="${REDIS_CONF}"}
-: ${REDIS_USER:=redis}
-: ${REDIS_GROUP:=redis}
-: ${REDIS_TIMEOUT:=30}
-
-# https://bugs.gentoo.org/631002#c10
-# Force '--daemonize no' to override the config file 
-command="/usr/sbin/redis-server"
-command_args="${REDIS_OPTS} --daemonize no"
-command_background="true"
-command_user="${REDIS_USER}:${REDIS_GROUP}"
-pidfile="/run/${RC_SVCNAME}.pid"
-retry="${REDIS_TIMEOUT}"
-start_stop_daemon_args="--chdir \"${REDIS_DIR}\""
-
-depend() {
-	use localmount logger
-	after keepalived
-}
diff --git a/dev-db/redis/files/redis.service-3 b/dev-db/redis/files/redis.service-3
deleted file mode 100644
index 1c733fcec172..000000000000
--- a/dev-db/redis/files/redis.service-3
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=A persistent key-value database
-After=syslog.target network.target
-
-[Service]
-Type=simple
-PIDFile=/run/redis/redis.pid
-ExecStart=/usr/sbin/redis-server /etc/redis.conf
-User=redis
-Group=redis
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/dev-db/redis/files/redis.tmpfiles b/dev-db/redis/files/redis.tmpfiles
deleted file mode 100644
index 657d8a551d4b..000000000000
--- a/dev-db/redis/files/redis.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-# redis runtime directory
-d /var/run/redis 0755 redis root -
diff --git a/dev-db/redis/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild
deleted file mode 100644
index 5064cb59f2ec..000000000000
--- a/dev-db/redis/redis-5.0.14.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="https://redis.io"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+jemalloc tcmalloc luajit selinux test"
-RESTRICT="!test? ( test )"
-
-# Redis does NOT build with Lua 5.2 or newer at this time.
-COMMON_DEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:5.1 )
-	tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( >=dev-libs/jemalloc-5.1:= )"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/redis
-	acct-user/redis
-	selinux? ( sec-policy/selinux-redis )"
-
-BDEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-# Tcl is only needed in the CHOST test env
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-lang/tcl:0= )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.3-config.patch
-	"${FILESDIR}"/${PN}-5.0-shared.patch
-	"${FILESDIR}"/${PN}-5.0-sharedlua.patch
-	"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
-	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
-	"${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch
-)
-
-src_prepare() {
-	default
-
-	# don't call ar directly
-	sed -e '/^STLIB_MAKE_CMD/s/ar/$(AR)/g' \
-		-i deps/hiredis/Makefile || die
-
-	# Copy lua modules into build dir
-	cp deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c src/ || die
-	cp deps/lua/src/{fpconv,strbuf}.h src/ || die
-	# Append cflag for lua_cjson
-	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-	append-cflags "-DENABLE_CJSON_GLOBAL"
-
-	# now we will rewrite present Makefiles
-	local makefiles="" MKF
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
-
-	# Use the correct pkgconfig name for Lua
-	if false && has_version 'dev-lang/lua:5.3'; then
-		# Lua5.3 gives:
-		#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
-		LUAPKGCONFIG=lua5.3
-	elif false && has_version 'dev-lang/lua:5.2'; then
-		# Lua5.2 fails with:
-		# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
-		# Because lua_open because lua_newstate in 5.2
-		LUAPKGCONFIG=lua5.2
-	elif has_version 'dev-lang/lua:5.1'; then
-		LUAPKGCONFIG=lua5.1
-	else
-		LUAPKGCONFIG=lua
-	fi
-	# The upstream configure script handles luajit specially, and is not
-	# affected by these changes.
-	einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
-	sed -i	\
-		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with luajit)
-
-	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
-	# also, don't define ANSI/c99 for lua twice
-	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
-}
-
-src_compile() {
-	local myconf=""
-
-	if use tcmalloc; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} MALLOC=yes"
-	fi
-
-	tc-export AR CC RANLIB
-	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
-}
-
-src_test() {
-	edo ./runtest --clients "$(makeopts_jobs)"
-}
-
-src_install() {
-	insinto /etc/
-	doins redis.conf sentinel.conf
-	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
-	fperms 0644 /etc/{redis,sentinel}.conf
-
-	newconfd "${FILESDIR}/redis.confd-r1" redis
-	newinitd "${FILESDIR}/redis.initd-5" redis
-
-	systemd_newunit "${FILESDIR}/redis.service-3" redis.service
-	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
-
-	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
-	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
-
-	dobin src/redis-cli
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
-	fperms 0750 /usr/sbin/redis-benchmark
-	dosym redis-server /usr/sbin/redis-sentinel
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redis -g redis
-	fi
-	keepdir /var/{log,lib}/redis
-}
-
-pkg_postinst() {
-	tmpfiles_process redis.conf
-}
diff --git a/dev-db/redis/redis-7.0.1-r1.ebuild b/dev-db/redis/redis-7.0.1-r1.ebuild
index 4bb18fce768c..f43853ced40b 100644
--- a/dev-db/redis/redis-7.0.1-r1.ebuild
+++ b/dev-db/redis/redis-7.0.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+jemalloc ssl systemd tcmalloc test"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	acct-group/redis
 	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
 "
 
 BDEPEND="
diff --git a/dev-db/redis/redis-7.0.2.ebuild b/dev-db/redis/redis-7.0.2.ebuild
index c8c1359e41d5..3e4ee296d8aa 100644
--- a/dev-db/redis/redis-7.0.2.ebuild
+++ b/dev-db/redis/redis-7.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+jemalloc ssl systemd tcmalloc test"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	acct-group/redis
 	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
 "
 
 BDEPEND="
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index f7f5e76522fe..5365c3b69d9a 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index ae0830ab8683..08fc8550117a 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,7 +1,9 @@
 DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
+DIST avrdude-7.0.tar.gz 2354082 BLAKE2B 44cc6cb82abd4e44f9e7f72901cd9b2a13c9e7635582993ea9a01ea482709ca6a8a3454980446d1196a67cec19a021133d5821731618350336f81fce09d7c049 SHA512 ca3338e6f2f0efc102e70f72531efbd237c5f7bc282d8db5530038f9e20b18a7c2682343bb2baff08c81f8959b066323a444dd64c2362a340a9d9708f90770e0
 DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
 DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
 EBUILD avrdude-6.3-r1.ebuild 1604 BLAKE2B ee08eb332a7c39e4c6fe962b385feed5194ce7ccbf3fee00735e71525f9034de3cb501cb2073ceb27cdfc9c6e1bd8d0d33971f0b126cf336e304d353ab460230 SHA512 cff807fb969f08f298692ca01d62420f76c59a36b986c58c951e0625384077857f6ce7e3516b6a4622709f2c0655302a378f92ba4fcfde01844eb172ed8ada0e
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
+EBUILD avrdude-7.0.ebuild 1757 BLAKE2B b68ffa56d1ee92eabcd40ef6d1f970cce0ef3108c8926c9f73b9bc359420ee22dc87b4e9268a5210f648d92fca6cfa9825a28f8453e43f412be7c4dff58305c6 SHA512 e5ef9a966e0f937c15899d82d1f1423c8981bb6c23cdd122120597eaf408a8c0f9c2c800ff64214cf6086075ee94541be1c9da7a8d523ca63e98799fa3ca1243
 EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
-MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
+MISC metadata.xml 445 BLAKE2B 022417895def5659b262f5b522881b7c3cd9d45129e3adb8bfe598b8301591f6367595ec529ad812c3d814e801939a0f7b41d7dedf101cdd487741f43a2d5a72 SHA512 2d68e3db08f4a8d74b03cdac07ad45c00fe37794fd7cdaeb8ccd0a9dd0972fb0a60e37c8f37f4801b657ee415f4966d591854fc7176a4e274e9ad60b3cbba012
diff --git a/dev-embedded/avrdude/avrdude-7.0.ebuild b/dev-embedded/avrdude/avrdude-7.0.ebuild
new file mode 100644
index 000000000000..be2345c4ae9f
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="https://avrdudes.github.io/avrdude https://github.com/avrdudes/avrdude"
+SRC_URI="https://github.com/avrdudes/avrdude/archive/refs/tags/v${PV}.tar.gz -> avrdude-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ftdi readline"
+
+RDEPEND="
+	dev-libs/hidapi
+	virtual/libelf:=
+	virtual/libusb:0
+	virtual/libusb:1
+	ftdi? ( dev-embedded/libftdi:1= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# CMAKE_INSTALL_LIBDIR is not respected. Fixed in the next release.
+	sed -i "s@DESTINATION lib@DESTINATION $(get_libdir)@g" \
+		src/CMakeLists.txt || die
+
+	# For some reason 'TYPE SYSCONF' and 'CMAKE_INSTALL_SYSCONFDIR'
+	# prepends '/usr' so the config ends up getting installed as
+	# '/usr/etc/avrdude.conf' which is not correct.
+	sed -i 's@TYPE SYSCONF@DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}@' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	# Optional libraries like libftdi aren't gated behind options and
+	# find_package calls, but find_library is called directly
+	# instead.
+	#
+	# Set the cache variable to an empty string if we do not want a
+	# library to be automatically detected.
+	local mycmakeargs=(
+		-DBUILD_DOC=OFF # This currently does nothing...
+		-DBUILD_SHARED_LIBS=ON
+		-DDEBUG_CMAKE=ON
+		-DHAVE_LIBFTDI=''
+		-DHAVE_LIBHID=''
+		-DHAVE_LINUXGPIO=ON # Seems like there is no reason to have this off.
+		-DHAVE_LINUXSPI=ON # Ditto.
+	)
+	use ftdi || mycmakeargs+=( -DHAVE_LIBFTDI1='' )
+	use readline || mycmakeargs+=( -DHAVE_LIBREADLINE='' )
+	cmake_src_configure
+}
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index 130f6cdf00c7..b9a0b133cefe 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">avrdudes/avrdude</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index bcae29e23ac9..8e463bbb5591 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 5c0ef949be85..085eee5f16f2 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcmail-1.69-r1.ebuild 1478 BLAKE2B c3a707b73c57d7528cd86c5621fe14fd65e1d412b6735884a95c3f868f72cedaf4a8edacaf915c4f992ed0bd6c1089a949198f0f1893fefffa7b22b6fbdbbb11 SHA512 e845293b7b79c796d5c433971e2a4dbb185b3930fc048915ae84e2f2631af396454b3b8b2029d04289dba96f2db6c2460dcc1d943dc8db8ddea4219313e31da7
-EBUILD bcmail-1.71.ebuild 1431 BLAKE2B 72738bdef4df595f9777ec4a9c18926f1edf0e0d32d126fbb5abb18be78ccb1419a65aaf44cb6c239c38d5e992ed89a97f87496f3a40311d7be3ccea42260c87 SHA512 4dbe24f255604b5420b0c0275a8a8bd363a25658ebe9f75759e6f47e84b2946f176ff88285c9403980dd28ddc47a1b14617804c5831bb6c700137e4cd80d3a3d
+EBUILD bcmail-1.71.ebuild 1430 BLAKE2B 19683850f07233ce075895df1c658e487d2c06e72f987edbc6a639a1eb36b6a62b218e7d7c2b39acd1d2da186f4d4e334a776ecff0192296003e02b3db5121c3 SHA512 9466d5acecbe4710a20fac17bc625221195c370b7e1e09c9eec6a0e1bebbca293a10a6d16ed714ba02df30bf1f73fee36723c550db9d63c78984f6afc2e13fee
 MISC metadata.xml 593 BLAKE2B 03a8a1bc9096f606d9e934b05910a5052df992a0e9f6412177aad141bae2bef648e4208e1b967e318f11e3e9a227d5783d0ce6880ef44952e238ff3831ca4200 SHA512 42de422b76ba5667882f973abfb9b482e9c0b9ac07c803be0ee9fc322c568d2cfa29e3fa56e0b57a4ed143a3645a484447dd981385b2ce49c5667f734d40c979
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
deleted file mode 100644
index 3c07eddb70b3..000000000000
--- a/dev-java/bcmail/bcmail-1.69-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="
-	~dev-java/bcpkix-${PV}:0
-	~dev-java/bcprov-${PV}:0
-	~dev-java/bcutil-${PV}:0
-	dev-java/jakarta-activation:1
-	dev-java/javax-mail:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
-
-JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,javax-mail"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"	# OK (106 tests)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcmail/bcmail-1.71.ebuild b/dev-java/bcmail/bcmail-1.71.ebuild
index 20f703b908f4..6d64d374d63a 100644
--- a/dev-java/bcmail/bcmail-1.71.ebuild
+++ b/dev-java/bcmail/bcmail-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 1cfcdf853149..6f614ae3318c 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcpg-1.69.ebuild 1415 BLAKE2B b4c064bdad6b5c2a2d9102f3fec361a71a9b52f29ee0d78be6839dc9ba4b89de9eb4a0b272dad84041e1910ed58a8c6c852094f965b1c32ba1e89ea407a09508 SHA512 f52fc87fec7482ba4e6206cda2f52200b4c00228031ebfe482a56b32f76aaa813ca6ea491b040d8ac424432cb7934e78e98f6deab6c844605c7cc226f761f17d
-EBUILD bcpg-1.71.ebuild 1281 BLAKE2B 08fbfdab07b7229beb60b08641c4961e6d6d93f51634305c7c16325a5c77927c766c9554ca2a321a7c4c86e69d621eb7a782c9996efcc02739466c92cd50981f SHA512 136f648117724bf4e05a201b195d07928cf98f38e5a0828f3ae04789226ba233995a386c34faa8fbf33368000f7ef76bbb65dbd4c647ade084400a3b2e19be04
+EBUILD bcpg-1.71.ebuild 1280 BLAKE2B 5c928e2def51669efc1881793fdaf5283612797b2a06c66ee4b0f967ea102957565bc29df62cb4389b5d0c64427e3ffbaca2640a5fcdf3a3e319e5d95d6573a3 SHA512 648ce8d3a9107b9538acc0813fcdf77116dd784fd075af8f6b94bedd4d7d8bbc4229a09fc84f9e1a56bcdad374d78ac064e013cbf3bba434c04e5d58671e1fd3
 MISC metadata.xml 521 BLAKE2B 76af9d5a734fef6cc73b43cf2f3cdf630fba2ff8deeaebe787b08b5b94f0bc1d7988ffb1d4820641c05d5fa139dfe0798aa7105e93142c835644760dbe52121e SHA512 4202d5ec7ba349c1cabafc474edf5cc5379c475d3a313b2a9ea90f1f7edf88d9a91b557042cfcf496f477b02a7f0b5e1ae61ded26f92bdfca15812fa34ee2133
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.69.ebuild
deleted file mode 100644
index 7e9f5e64e5f0..000000000000
--- a/dev-java/bcpg/bcpg-1.69.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpg-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="~dev-java/bcprov-${PV}:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
-
-JAVA_GENTOO_CLASSPATH="bcprov"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.openpgp.test.AllTests"	# OK (19 tests)
-	"org.bouncycastle.openpgp.examples.test.AllTests"	# OK (6 tests)
-	"org.bouncycastle.gpg.test.AllTests"	# OK (1 test)
-)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpg/bcpg-1.71.ebuild b/dev-java/bcpg/bcpg-1.71.ebuild
index e6901863e5a5..8028aba31a23 100644
--- a/dev-java/bcpg/bcpg-1.71.ebuild
+++ b/dev-java/bcpg/bcpg-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index ed9f98dc5e7f..b4c2a3b42ff6 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcpkix-1.69.ebuild 2556 BLAKE2B 842dfda2673810899cc1a164924b97f142214ab7f34164a87bfc2b16360e688a082a5bc09aca36765086d2b42b0f6e499fd10c2f31e8a63d72742a4afeb7859a SHA512 fdff8b61adafbf1eff91ff020c8042c0f332f53e66be300e73eadb9efe30cf57f28468a64a9a9b13842305db4219757a9d6349e2fae26b98dd9611ed7ba7f89e
-EBUILD bcpkix-1.71-r1.ebuild 3075 BLAKE2B 7c31469d7bb86667277d47da094eb8dcf6b46a71abf00b96b680ccba9ea9ef88cda746a729db3ec9b410832f6800b1a9d75ba93fa31cb57630b64795c00ac6dc SHA512 bdf7a6a8965f5041ab75f6f6f0a5ba7e425dd7e68865c4ff196d9351679ed9885f2087abb89874cbd14de61496a6cb5ed06e78a61dcc397403e138222a4db297
+EBUILD bcpkix-1.71-r1.ebuild 3074 BLAKE2B 901a79ffdb3d3600548dbf009fc22a7f1792089a0854aa7853c5fce74563c6e82973946a5ab47fd8528b3e775b4fe3b6738fcee8b49273e78fe7404186c4da39 SHA512 e89367553ec992250775fb0006e8438348f89e4abe2e2cb8e640b6956277bda752dbd6e3821f0c9f1dff1b89d7d65b08cca20bc7cad24b6649231faa444f7f6e
 MISC metadata.xml 546 BLAKE2B 3e07f58b65f0148062a3f1b20c06d71ce1925cf7b91d167a07d21028f541cfbc69b8a78e914ea6b86598afb3f3ae7f841defa6e1b691fac5293f2cb6746c1f0c SHA512 137f6f4d3d26d90109102fa49e37a42ea3628104adaf65e0b93ca652abd1aa6392e3f76dbf342aa70706b734d8b7f262f2b826e3ce33ae35fa60c40e548bf89b
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
deleted file mode 100644
index f719172983a9..000000000000
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpkix-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="
-	~dev-java/bcprov-${PV}:0
-	~dev-java/bcutil-${PV}:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
-
-JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.cert.cmp.test.AllTests"
-	"org.bouncycastle.cert.crmf.test.AllTests"
-	"org.bouncycastle.cert.ocsp.test.AllTests"
-	"org.bouncycastle.cert.path.test.AllTests"
-	"org.bouncycastle.cert.test.AllTests"
-	"org.bouncycastle.cms.test.AllTests"
-	"org.bouncycastle.dvcs.test.AllTests"
-	"org.bouncycastle.eac.test.AllTests"
-#	"org.bouncycastle.est.test.AllTests" # (16 tests) org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
-	"org.bouncycastle.mime.test.AllTests"
-	"org.bouncycastle.mozilla.test.AllTests"
-	"org.bouncycastle.openssl.test.AllTests"
-	"org.bouncycastle.operator.test.AllTests"
-	"org.bouncycastle.pkcs.test.AllTests"
-	"org.bouncycastle.tsp.test.AllTests"
-)
-
-# https://bugs.gentoo.org/823347
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="2048M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-# https://bugs.gentoo.org/823347
-pkg_pretend() {
-	check_env
-}
-
-# https://bugs.gentoo.org/823347
-pkg_setup() {
-	check_env
-}
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-# https://bugs.gentoo.org/823347
-src_test() {
-	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
index 412e25dc53d8..bcf70c8d215a 100644
--- a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
 # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 0b6fcd056b50..f7f6735f7e35 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcprov-1.69.ebuild 2754 BLAKE2B 189ff7bfda398f16df34cfc644024a5287dd51fa2c5e2c0919ed4cc2ae2df9083d7c0efb604402156e58292589ef6c8eb631ade1d497db9943623178155a8689 SHA512 72828c651c1deaf67721d0515feab2821876810fe29554bf0cadb09a5274115f10ba2df1f3b4b2bb93ab205dfb6e7182275dbccd19931902186c84464abb8324
-EBUILD bcprov-1.71-r1.ebuild 3488 BLAKE2B eb777cc7ea44494e719245c8c12c3d5e37a9168a5d3ac8d45a187508112c1c50654877760ae18efd098a9045ca44252b7a5413aea608104d14707758c940947b SHA512 5a3d8e073416e759597d18f20dbc3e524d35fc0147a83abce4545071201e095cc46b4628eabe6b1c23dc544e810d4111b8bf082b8af6a5308a625d2cfe6104d8
+EBUILD bcprov-1.71-r1.ebuild 3487 BLAKE2B 18f58c8e846c25872ef20ddbaac6518cb25d1e91211e95e1f91811fd67087eba27f33e2e972186d84facc79226d04d320428fa6b7383fab2ceef3b5958d3f54d SHA512 ead220a5b7ae62374e5a67d95e86e2692017ddd2c85ffceeef2defe7df253ef982ccfbcbb0769f97a70275c2404db0c04dfd0a0c6d79aa4455f9f3f4d14b4d2a
 MISC metadata.xml 476 BLAKE2B b065e42576858847f7c1e2a8f27b836c59ca67f9514bae2077d884601e73fe7cf347beae0c31f2d4e795787bf22d9e7d575555cf0a1d1de2de36bd200fc4af0b SHA512 510131e9259fbe497800cc5ac8650a970e45013c398b4aa26a240c5ef66186fe594f9ff9d21258d7bb744aed1d5365ab462fa5abfec7ef48efbd15071789ea15
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
deleted file mode 100644
index e3a5ab067c7d..000000000000
--- a/dev-java/bcprov/bcprov-1.69.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
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/prov"
-
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"../core/src/main/java"	# package org.bouncycastle.asn1 does not exist
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( "src/test/java" "../core/src/test/java" )
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
-
-JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.asn1.test.AllTests"	# OK (18 tests)
-	"org.bouncycastle.crypto.agreement.test.AllTests"	# OK (14 tests)
-	"org.bouncycastle.crypto.ec.test.AllTests"	# OK (1 test)
-	"org.bouncycastle.crypto.prng.test.AllTests" # OK (1 test)
-	"org.bouncycastle.crypto.test.AllTests"	# Time: 126.95 OK (6 tests)
-	"org.bouncycastle.jcajce.provider.test.AllTests"	# OK (29 tests)
-	"org.bouncycastle.jce.provider.test.AllTests"	# OK (1 test)
-	"org.bouncycastle.jce.provider.test.nist.AllTests"	# OK (283 tests)
-	"org.bouncycastle.jce.provider.test.rsa3.AllTests"	# OK (11 tests)
-	"org.bouncycastle.pqc.crypto.lms.AllTests"	# OK (17 tests)
-	"org.bouncycastle.pqc.crypto.test.AllTests"	# OK (81 tests)
-	"org.bouncycastle.pqc.jcajce.provider.test.AllTests"	# OK (89 tests)
-	"org.bouncycastle.util.encoders.test.AllTests"	# OK (15 tests)
-)
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="2048M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-}
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-
-	# These files are not present in the upstream jar but are used for tests
-	# Removing them from the jar file after testing
-	zip --delete "${S}"/bcprov.jar \
-		"org/bouncycastle/pqc/crypto/ntru/*" \
-		"org/bouncycastle/pqc/math/ntru/*" \
-		|| die "cleaning after tests failed"
-
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcprov/bcprov-1.71-r1.ebuild b/dev-java/bcprov/bcprov-1.71-r1.ebuild
index 09fcf354c7f3..fbe5c65f3f19 100644
--- a/dev-java/bcprov/bcprov-1.71-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 95c6d9a46ffd..3bcb3678702f 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,5 +1,3 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
-EBUILD bcutil-1.69.ebuild 1344 BLAKE2B 58f67dc29b82749f8aa3177184704216626b9e68105555783a3bbb82f24a1e7bd913ca97a9291e076a68dd96078462e9e1757d1d7d2b81dae03473fda1ac616f SHA512 59eec044a0a16d9899a1d472184f98afd131c879251910f8130f2446123d531140f9ee6a2cfdab22f7cc7fab69e6b4f91456f91f27cd693c6c91a8382290b984
-EBUILD bcutil-1.71.ebuild 1293 BLAKE2B fa35d697b00ea9bffa394970fe6ff6e5ddaad9fde6c05fe684e63c56de812827dc4b932cea375542f565b2d312db3c32aa77b06ba0b585773c9e7f46ffd1fa09 SHA512 414573d03a128a0b3d996cc9c67520689157a759e67bad176df8c2b7ac482e5b57cbe31b8f1fe65b22adbeaf0525b7ee216ce58eb350c2f41a8b045569a87caa
+EBUILD bcutil-1.71.ebuild 1292 BLAKE2B d7d4b54f874eef8c4af2230f40003c147ed08052ab64eb793a3900d428500fb4d7edcb15772f54490682ef564394ba0115623a3fef017e3b91a581c94eacadf0 SHA512 cf04d5ce377fa1c99078362efbb9ef74946ae2f7cfa333bd66d79c5d06dfd905b2e08914e7c47319971e162c415d0b2a5bec788a0aca8a3651377107144909be
 MISC metadata.xml 400 BLAKE2B 7b3239d613e5793ddd738c087d43a9d6f5b0744acf64103234e0f6628aa2296c6a5f86c9af1b980b715a5c58bdb11187a19e48a0cfbfa4f9f63231ee3396e01c SHA512 5754fab7fa105fad0b55babb33cda5e5b309f047bb6da3b7760bd8a3fab219209aa52a3078c43b194fe7a02cff8e5d8ead3e2ba9c74837ce0e604574b344ed16
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
deleted file mode 100644
index 69a1a2711924..000000000000
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcutil-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="~dev-java/bcprov-${PV}:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/util"
-
-JAVA_GENTOO_CLASSPATH="bcprov"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.asn1.util.test.AllTests"
-)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcutil/bcutil-1.71.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild
index 9f0b469f14be..df97d23f0e69 100644
--- a/dev-java/bcutil/bcutil-1.71.ebuild
+++ b/dev-java/bcutil/bcutil-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 072b244da5aa..dad1474393bb 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
 EBUILD javassist-3.18.2-r1.ebuild 1028 BLAKE2B 9bc9eccea4e5d896eddbbad826a95504d54cc4b352189b3dd0ad6a56dfc34641e3e800dc99aa2348c565e03fee46534b3ad19633283670380a0bdf44a635cce0 SHA512 75eb795cd8a27728e57fc168c78fb1b2aaa5d2666432690e1e20690b64a955a6471aacba04101dc2c80f1dd4afd68ebe00e9c176d1b6bce412032ff173cefbb3
-EBUILD javassist-3.29.0.ebuild 1995 BLAKE2B 3156102029db6e1a485bc3425f43549c026849f438d5e974a66c8a78ac73eca8c36b562b1edb6cc005f2e088f0ed6eb8385107523e2a701a67f38536f371f9eb SHA512 4659ed0839689127e20604aa70ad44d38200661eac574fe6373e9f6f9e7a7a5e87757a3a6d1a9b01a53b3115da72932ace439c4c24fde937684dbb71bcc519e8
+EBUILD javassist-3.29.0.ebuild 1914 BLAKE2B 3c9d3a57135b4ba86fd826c018794925f2f7a3b878753fa4c99294a5d73e31d24aa25aa0e92ebd842720ba6bf6b3d62404c81fce13dd803f956527302645026c SHA512 62e4ef27c082821b4bf0e44b930fab81f42ab70d80005d9a9f66b63569d3f7858ff839be6e6226bd713e00a504d0cdb30c629a8f3048902bb8a3974929f5f56b
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.0.ebuild b/dev-java/javassist/javassist-3.29.0.ebuild
index 712141e86f6e..0f29828ce5cb 100644
--- a/dev-java/javassist/javassist-3.29.0.ebuild
+++ b/dev-java/javassist/javassist-3.29.0.ebuild
@@ -30,15 +30,7 @@ RESTRICT="test"
 # test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
 # test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
 
-DEPEND="
-	!test? (
-		>=virtual/jdk-8:*
-	)
-	test? (
-		>=virtual/jdk-11:*
-		dev-java/hamcrest-library:1.3
-	)
-"
+DEPEND=">=virtual/jdk-11:*"
 
 # https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L156-L157
 RDEPEND=">=virtual/jre-8:*"
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 6b37ac21a48d..ebaadd35f2ef 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -8,5 +8,5 @@ DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb11
 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
 EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41
 EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
-EBUILD jffi-1.3.9.ebuild 2418 BLAKE2B 663cf90de986a78643bdae6d879babe544bd949fb2a7bced8825032a80cdd2e136bde52aa68a480891278f6582523f138672289d43dfd42ffc6c895d77def913 SHA512 68454973294e4749b5d07f266264269c19d2edf5c629430105b04895e072823a32e8a619734681eda069e2060150a5de20b4711ec3df9e7bc3fbbe68ee7fa872
+EBUILD jffi-1.3.9.ebuild 2417 BLAKE2B c8bacff9935a8e6b44a857486c3b605a4c0a3210c50a0e309161593707654a930e68dbce87fe190bd2678c0576ae6e24078ed0f0af501c95c9ea446650705a3a SHA512 8b6ce9c691dd7f99c33a37999c9d12de082d3d64c1239cae7bf0f16308ec9a9dd4c014e8e203fc4c74dfc694f2b84d389d8cb34c3a634bc6d53b0ef4dcfafaf6
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
index 938783d2c89c..d74a2940741e 100644
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 8a0acc71f397..c2c2b597d1dc 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -2,8 +2,6 @@ AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58
 AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359
 DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
-DIST jnr-ffi-2.2.8-sources.tar.gz 261959 BLAKE2B 16f7b89c88a61fa07da65d4e5287258f96550b93898bb7313ddd62d1f002276da86aca2c79874eccb466eaebcad5181ff33539996a6558b6d79ce9280cf9c0a9 SHA512 15187d90f15ad82cb6cac0617806ab7d0322bfcb4f44523f2272f93f19ec115625806c9d450bffaa57db32c70906328c8edc905046465b0ec3eb6ff52e500b42
 EBUILD jnr-ffi-2.0.2-r1.ebuild 1479 BLAKE2B 10de36e96180e2943bcf200bc49961c5258cb7dabcaf1536e79bdb2c0c5f58cc023d0c09e591746c889fc86e012c1337ef8a66c6ee8c181e1415a30ebc8869c0 SHA512 0d18e65d626dbcdd69c6f47d21e7505112e3ff98633137c3035d6e5e32536a5a36aed2a333a1f3d34e7da58b4f0e6a2225a6d7f88c3c58a23640170f4a48c9c3
-EBUILD jnr-ffi-2.2.12.ebuild 1195 BLAKE2B b23037cbc34cf8fbd23661aa1282433d9cdc4fee13fa566e814c8b808b690b9c8d5ea3b1ce163857e69652955b46fe9d7e954b045288aacb9133b35c55192815 SHA512 33bf25a4186064b3f981927be085984c63faa26ff4368cdcdc8b728ba962fb4aadaaed3a9b72b75cc25505ceb683a72058876f3ac27e44fcb5ebea637d558f90
-EBUILD jnr-ffi-2.2.8.ebuild 2061 BLAKE2B dfe1bbdfe2a63a55194bb6352c7de05806ce619ea534d5df55a2bdad30a671a15d366937805f02d4c45a488415621d56276381cd6e6a21173ab0b020a2b288e2 SHA512 ad64a7f90f45a157c9e42eeb6ce4d27a58570354cd1b7dcf92cb4e510390911f67b0014ac0af3ee7653e584ef9b64bbdf265d5cd64ab3f45c54b47305739285d
+EBUILD jnr-ffi-2.2.12.ebuild 1194 BLAKE2B 7be4c141653d10a73ba094287ea631f7c4d81a996ac28663253812fbcaabef5a356e3cf267fabc09b152cfb332fcd4fee55e142d63fd0b47db9fd842f7a6f0e5 SHA512 68499cf6632bc7f1f3a25f0baad8a3bc8ed015c7ee0d982197f65e5acd39093414bd5c870e9ef5b45cf91284fc9671c93b13db476a6b2e97e676ad654a3464bc
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
index 789df70acdc0..aec229af6305 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
deleted file mode 100644
index e577aeebbf63..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.jnr:jnr-ffi:2.2.8"
-# no junit-jupiter in ::gentoo
-# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-# com.github.jnr:jnr-a64asm:1.0.0 -> >=dev-java/jnr-a64asm-1.0.0:2
-# com.github.jnr:jnr-x86asm:1.0.2 -> >=dev-java/jnr-x86asm-1.0.2:1.0
-# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
-# org.ow2.asm:asm-analysis:9.2 -> >=dev-java/asm-analysis-9.2:`ver_cut 1`
-# org.ow2.asm:asm-commons:9.2 -> >=dev-java/asm-commons-9.2:`ver_cut 1`
-# org.ow2.asm:asm-tree:9.2 -> >=dev-java/asm-tree-9.2:`ver_cut 1`
-# org.ow2.asm:asm-util:9.2 -> >=dev-java/asm-util-9.2:`ver_cut 1`
-
-CDEPEND="
-	dev-java/asm:9
-	dev-java/asm-analysis:9
-	dev-java/asm-commons:9
-	dev-java/asm-tree:9
-	dev-java/asm-util:9
-	>=dev-java/jffi-1.3.6:1.2
-	dev-java/jnr-a64asm:2
-	dev-java/jnr-x86asm:1.0
-"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-# Runtime dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-
-RDEPEND="
-	${CDEPEND}>=virtual/jre-1.8:*
-	>=dev-java/jffi-1.3.6:1.2"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jffi-1.2,jnr-a64asm-2,jnr-x86asm-1.0,asm-9,asm-analysis-9,asm-commons-9,asm-tree-9,asm-util-9,jffi-1.2"
-# no junit-jupiter in ::gentoo
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 041051b5fc00..ab80f05cf9ae 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -2,5 +2,5 @@ AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
 DIST jnr-netdb-1.2.0.tar.gz 649059 BLAKE2B 660074d3a0d201784bddb259796ee4bb87a3579d6ffffcb5c3bf171d34e525c768c8c9282d8a99c250282d108011c0cf4bc9b8cf32dc7f3edc7e0a2b1cbaf9d4 SHA512 6eeb21d42b1eb7c0beed4f263c3440c7e5ae15f76365fb189fc8727c824e01d92662564ae641e1233ec0df68f6761c3c31a8a61891de59a524c213959bd32856
 EBUILD jnr-netdb-1.1.4-r1.ebuild 1150 BLAKE2B 6b00dfe46c10602181bfeebd86b05cc1b0846f4c56703585c2e815be7d10cce09f3b8ded293f5cb9438164b846db13db993b9cc04a63b697f46b2a8f435f060a SHA512 af5c04260d6bcf0aac9e4f236c3b2a5bab0dbb457f12abee4c5f009c8545ba7104b6c8561daa6ac885c6b84527e43faa042791a2099f6fb0fabc8fa50fc8ac10
-EBUILD jnr-netdb-1.2.0.ebuild 849 BLAKE2B 0f7227b681f823ca1cd20126f490638aca633d855863f0cc53f002703c493b14861ef6ab412081e3c77e545e600610f62395d5600dd0a33f6aa63d3ecdb96cd7 SHA512 765b337c20de4fb5b614b23b328bd631a1afbf828670172b6abe53a02ec6f063a8687db1cf2d107ca87216f46c158dd2b97f63a914f03ab6a51f62a6f14ec2bd
+EBUILD jnr-netdb-1.2.0.ebuild 848 BLAKE2B 276fcbd57b00142e429eeaae6e240ab92a45d1975b6983cbe27064920d46c1aef09152f442e71e92a6695e19f7e8acc129cb8b8fba14ad20dfab3b31dfcb2569 SHA512 d2a3ee67d086dab3e1e5e33c393fec41557e7610acfb376b0d1897ebf7c1583f65fff70b080eb7bb74bcd0821e6edf1593e971eafccd1ce089cc90e4e830e6af
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
index 137495a6b39c..03d46d9a7634 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index be2475cf43b7..7a4b549a5e00 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -3,5 +3,5 @@ AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f5
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
 DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
 EBUILD jnr-posix-3.0.10-r1.ebuild 1295 BLAKE2B f9ad7d57774afd7dfba2f22a774d2539332e474a85ffb0f601ba734127fb99644ea1e1912f245707d9b5d5e432d46d241d175f4fde7e9b168dc2f74b21aa52f8 SHA512 1ac23f843d6a1d3c5520fa464f6284573403e8b361eddb29647a81a938cc22e602508c1f04dc2a887042f99f0b0f8d21c1c4776c3dc14fcc25b306cfee296494
-EBUILD jnr-posix-3.1.15.ebuild 1926 BLAKE2B f62e1fe5872bd446848ae9cf4fd726ab7bb2e181cbd2a8009a048b9345dca41262cb1bb3daaa73ecc3137213222b63a65c92ca7561ebacd5ca7c9e870d036e85 SHA512 d099199f348d19f9cdc96347a42ce947f1b9fc644a78636dc3991c1d6251176eb55b380306057ec5add46fe236d2f7a8e2249c4487095d892961380a9a38e11c
+EBUILD jnr-posix-3.1.15.ebuild 1925 BLAKE2B f628e12409417907e9151f2b1f0f13e1b86377d37bdafabe8cb93d318bc8dcb3a00da31944d22f0257f23627d0e7f24dc98c4e07122eaa89e4ff55bb2aaa31fb SHA512 38ed70a57b2fd9fd3673968e8508e4a7f902faebe543ae3a086dc2a67d0c6058ab4c369143e6565f7b4a5eff00399a3f0864de90069fa7d5ef29973f09f83c1c
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
index a73708573ab2..3f90b95f3507 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
 SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	>=dev-java/jnr-ffi-2.2.12:2
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 0dc4654a4b1a..10a6ac1c22d5 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,13 +12,13 @@ DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a249
 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3
 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
 EBUILD tomcat-servlet-api-10.0.21.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
-EBUILD tomcat-servlet-api-10.0.22.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.22.ebuild 3016 BLAKE2B d95a171fd0f5d3ed467b02c7fef82df0cc15777ed8d62998eb7515fc7eba84a3c23934765216778dcace0abc47ded6ff71cca335bb4169669bc59d6d030da5d6 SHA512 08416d888f565b2fceb1b1f9a67fa755c1af92d0173a28e7330feb3df6fb7b041750e2ebf340168dac2560799eff7161655f2891fd46151d5e98e43e63e6109c
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.79.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.81.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-8.5.81.ebuild 3004 BLAKE2B 6dfb6ed890fe7c8461da4f71cb0d4ade2dfa2022647e91e1072d96bd20539d69dfb7cca636d65eed4a415c9047e75f7a24240af35b343737194f1ad6cc4ea04b SHA512 aa07371f8f1d8c8da1c59e8ba9216c4f524518b1a3d99418dcb18c6f08adde472411d9d644588ed529c3fd3dc3201d53d9bb79d79b402ab853db248dbb73bcb1
 EBUILD tomcat-servlet-api-9.0.63.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.64.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.64.ebuild 3011 BLAKE2B 2dbffa8fb7484e65d835e876744721aa4a4f67a2f01a8f83a38eefe550069260811e008fde80b228b14f1d6be90cf9ea06498d190ddf4963339872f3a2e4c81e SHA512 3227e875e3e5836ca8d2e75a9dd7da999d33ebce0af9579e39f5ea9fd8ea0e58578934953e2a29bf4f70c0f8140242a7e4e62daeca4fc028b48042f060b7e16d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
index 5ed928878473..df0da8059045 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
index c6359840b613..d52a57de49fd 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
index 09fffd263372..48250c32ab99 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 1b24caf6f237..7afe56d750fc 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,4 +1,3 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
-EBUILD xml-commons-resolver-1.2-r2.ebuild 838 BLAKE2B 80c9b8e63c333b12e016db4c0259de39d04acc722a3773ec66189b5aaea5609afd4ddce367c3248d93111ff864795d536975070ca5a0752eb7ff8d1004f4e01b SHA512 ee1f023f3d694f541f0028aca315d3d9bc1a75afc2e24581021676490d2c320a971244a818f3950b888c8e005928dcd6ff77d15f78a446cb7f9cb8a967125dd5
-EBUILD xml-commons-resolver-1.2-r3.ebuild 1111 BLAKE2B 50ba5d4751a150cbcd7fef6f8e2e1252b58083fbc45bbe238e9ea3905286eda0aa2683c179fe13aeb969a61a5a7f686b14e4e8847722262bb0a961e9c0f0df46 SHA512 c105c62c991bc4fcb6a70ec49b69468b2bd05539d7f7585b22072f563d242bb43b7e86d76e9d5c9f84e3d5f33c55642b398a6d8c0fcc1a8f79114420ac472556
+EBUILD xml-commons-resolver-1.2-r3.ebuild 1107 BLAKE2B 3fe189d061a76aecbd9a9b48537352a2200de560501093ec9a286bded92de841588aa1a7c729540842d162fa5592a3cacf94f192109de7c00a92a4598942d404 SHA512 f76ef0d77b2fbf50a218f1b95af11757fd07dac9ab3fac672215f8b25d6772ff10bfbd54a0e9ab4aab7eb2048f3240cebe090dcb91a46e10716b16d485c080d2
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
deleted file mode 100644
index 65f5894d45ab..000000000000
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-JAVA_SRC_DIR="src"
-MAVEN_ID="xml-resolver:xml-resolver:1.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML Entity and URI Resolver"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( KEYS LICENSE.resolver.txt NOTICE-resolver.txt )
-
-src_prepare() {
-	default
-	java-pkg_clean
-	rm -rv src/org/apache/xml/resolver/tests || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
index df851d6671ae..23e2253efc56 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/xerces/xml-commons/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b0ffc8f40bfa..f2052d179035 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a51ef2db534c..88549a15ca89 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,17 +1,18 @@
 AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15
 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473
 AUX epmd.confd-r2 60 BLAKE2B 6d4c0ecc74218941281dd7235b34ef2fcca32fc26f3f282551a6d551153b53f77f42b5139dfbee2b02a966cdea03fa350270e6897a57405ca2ac256d1b7eae50 SHA512 e594ccdfef8473f9fccbdee6fe084c43a4fadd5ac47ffb98aaa223902e74290e749f28b88952aa83eb207de1393d44184f81244c233b7d6afde04fc8615dfd91
-AUX epmd.init 534 BLAKE2B 34230f6c6edaed48123369df02f5fb71deb90491ebbb6d17984220dfd4615e029fa14aeb15c01ced15f98ec42aee256896a9b9680a4cce5d93e815c2a674efc3 SHA512 d11ef840a0edddd111da6a3c378756663f7337cb79713c475ccfec7e8a828fb4ef9f19f85d836ed0761cd9341d1242d687cf38ed5bbe267b4db5618c03ae6141
-AUX epmd.init-r2 388 BLAKE2B cf8f1b3bfaf5c0bb1a7acebf41e1c1138b880e91a5c732cf3f8ddcaea469f0bcb32c9b3bb1fc5c923a3d7d1f77ca419ae3b4c25223d6da9499c627d2cd20b545 SHA512 110dc6575eaecf88164283042210a8580642fa5c9f49a3529bb0d5cda683f9ae024f1c7da791c0d7bfa8aabc3baf29bb821b5640804b313bb6ffee41401a8eb2
+AUX epmd.init 536 BLAKE2B fc4d5058088e08f3ed17f4cfcff2190ec8b7fb922ca8ac1353b82f14319a443d23563c7d436b85946573f0313debcf5af4669caf013ea87d54af4f2da0692ff6 SHA512 e351892fe920d4dab4cc0bb1b448204f8b1e16b8e0ed687b285c52a8d5e00d6a39fb27e83d5c0b973b5b595f4b4274c64fa938a25853dcbae674edf1cae42d3d
+AUX epmd.init-r2 390 BLAKE2B eae80a5a919fe2511463f99f225bfde4e31d603552eac40164fcca8ddf66ae75c870ea63a40111b504eae4d775d4186a3aa21d6c991f87ae6e36d71ebf16112b SHA512 4f43110f1ed16a05283748a648e4640562ad886ed83a080455619f33090aa8d12e0c375a4916625dbfc44442de65a95eea72eb4423298a0c01e6fc7652f8e4ac
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 AUX erlang-23.3.4.14-emacs28-compat.patch 6237 BLAKE2B b5b8f0c7bfd1f217805d7279d85b7d09189d069814afde10b32446031c221aaac58aa7adaf993da7261c1d8889b5bef6cabbfc73b4062a6eeadae5e0d923c39d SHA512 e47364afaf8d29b1e9e1f6548bfe5efa110e56777d9db87fefd24ee201d5689f46e3e4d34c32b3a95353411500ae10fc1064f9ed155d5d6d97f442d749e38f9b
 AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
 DIST erlang-23.3.4.12.tar.gz 57278064 BLAKE2B 3620dd2e49cfd75e49bf573ad1a8f8952c232ce2bf734ee845d8e8bb26053e34df96b472a9490c1cdf77ae6c106732f6a68b2f5d31808fd941bddb616004819f SHA512 d4f468393116d2d24a5170d7efe04305d221baccccfc273d4740b701ec23d1e55268cc49eeb99722afa636431e6e50faa5c11758484aa71e29c2fb3ed7c2ad25
-DIST erlang-23.3.4.14.tar.gz 57288870 BLAKE2B 64c53eac18f970d7b6e560ec678c34cab7e9ecd77af1789843c17c072e05034bef00d0985a294b118890f30cd40e429db19d309626172deabcd2ee1328f04584 SHA512 1a1e5eebd471a919dbbbdfcdea32285d3c8f51d5ba4a4f16081c1ffc00cc118e2056ffb84040147ee70175a3cad4419501ec892dccd59cfa133d473eee3f00e9
+DIST erlang-23.3.4.15.tar.gz 57510217 BLAKE2B c07a1de91389774a8c62a0618567c0b8f8cad98674a1a2a737ed16d42a5a7c48cd7f53b433d44175c0a5abfbcc276b8cae389b165ae5343fa6d7a2aba9a930dc SHA512 a79c4deb8261a4c3e165198794dd0833d3e33bfc9ec36627b245f425cbdd354b82a018fe68debc68d4514972b3a4d171c8d4503bfbd73a678b0bd0c5b8343439
 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e
-DIST erlang-24.3.4.tar.gz 59298534 BLAKE2B 66e8cb2148392229fb24fb0994b09510ede89229b90708df7149393d4f522ccc98774fad9f924d2c1f806f099303e097e05b1f91348674e86057c0a8952e133e SHA512 bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a
+DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
+DIST erlang-25.0.2.tar.gz 59800286 BLAKE2B 4344ff5a21a6c0139842067d10d82435f504a5bd3b4112137f92ad06d7bff21352244c80eadad4a9efbc29692ac2be2a81b87ddde9b29433d1461a1148a733c7 SHA512 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43
 DIST erlang-25.0.tar.gz 59574655 BLAKE2B fddcd0d099b84981862b06397dcd6d1a53e11c5624f5e8e60ef0caa1db215a8447b6a9eaecd56761d3d7d213ca40b5e7e7b0860d2cbf0d547f5dfcf9e9edd08b SHA512 36f2d36c5d2d5dcd28c6f817f3dc008c902838115b8830a684f9d9290017074cbfbb616d4a28f02fedaab097e73183c86cef1ce28f656e0852df0a95c30c5639
 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
 DIST erlang_doc_html_24.3.tar.gz 36645792 BLAKE2B ef90b7d05ed43656ab1ffdbbd0833c9da08a867ad7a99ec0f7f1eb59697c1f9cd5ccd150b2e564af80b2098f063da0c76121d4444b5444e603581442ad1c7bc8 SHA512 b8d3832ffdbdede656b362d719474f7b9ff04a32ea7235e77d63755629cf9305c203cd6cd9ae089171b2cee694f9641d6ed5d0197e2acf893a31d25696096f1e
@@ -19,9 +20,10 @@ DIST erlang_doc_html_25.0.tar.gz 37051192 BLAKE2B 2d79ccb3b850b199de0a7da83c6358
 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
 DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67e3f31d106f6b6d04e5cc91efa8efc382ddb6b230f218fa543390bf4ec37f477e0c4979c82632ebfb6ccda8c5de1fbc41 SHA512 72876911a1ec82071225e7b71de0462254becd64892a5459239b9e44b20601f6b6990a12cd36a8320e81e5307bcf7b5e5057e42baec12403be4a0eda00cdf62c
 DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
-EBUILD erlang-23.3.4.12.ebuild 4499 BLAKE2B f5d60f5e4daf2766f1a8dce36ddfce00e220bb771ffb02da6448ae4526d499f433dff704d9381c9aa73cd9e3ccd0899a83441a394c0372e791786a7193694fdd SHA512 fd0a6b91636133698c5d9c9348e5db379547f84f5b1fe9a7541f5d8de3ae4205cc0ea0727d76d885908e1d19ae84dcbd2743d749e11bad4c9f76fdec0b82a7da
-EBUILD erlang-23.3.4.14-r1.ebuild 4556 BLAKE2B 814062c5bef24e854efcbecc84743aff69103e6f03ab6aa98e6e0aeb31924f54ce1adf22c2f68a5a1ee811cf84c9ac97cdf5a59cd38c02f4c00b998cf5113022 SHA512 ba33d1a2e9bf1ffcf8fd57929cd5e09dab4ac7ff5f4d2f8560ee88c90c7dd5e8e71d2ed956677842cf0f53711c92452273ec463d856ac8f270e6eeccdbf1ae4b
-EBUILD erlang-24.3.3.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
-EBUILD erlang-24.3.4.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
-EBUILD erlang-25.0.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
+EBUILD erlang-23.3.4.12-r1.ebuild 4499 BLAKE2B f5d60f5e4daf2766f1a8dce36ddfce00e220bb771ffb02da6448ae4526d499f433dff704d9381c9aa73cd9e3ccd0899a83441a394c0372e791786a7193694fdd SHA512 fd0a6b91636133698c5d9c9348e5db379547f84f5b1fe9a7541f5d8de3ae4205cc0ea0727d76d885908e1d19ae84dcbd2743d749e11bad4c9f76fdec0b82a7da
+EBUILD erlang-23.3.4.15.ebuild 4556 BLAKE2B 814062c5bef24e854efcbecc84743aff69103e6f03ab6aa98e6e0aeb31924f54ce1adf22c2f68a5a1ee811cf84c9ac97cdf5a59cd38c02f4c00b998cf5113022 SHA512 ba33d1a2e9bf1ffcf8fd57929cd5e09dab4ac7ff5f4d2f8560ee88c90c7dd5e8e71d2ed956677842cf0f53711c92452273ec463d856ac8f270e6eeccdbf1ae4b
+EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
+EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
+EBUILD erlang-25.0-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
+EBUILD erlang-25.0.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8
diff --git a/dev-lang/erlang/erlang-23.3.4.12.ebuild b/dev-lang/erlang/erlang-23.3.4.12-r1.ebuild
similarity index 100%
rename from dev-lang/erlang/erlang-23.3.4.12.ebuild
rename to dev-lang/erlang/erlang-23.3.4.12-r1.ebuild
diff --git a/dev-lang/erlang/erlang-23.3.4.14-r1.ebuild b/dev-lang/erlang/erlang-23.3.4.15.ebuild
similarity index 100%
rename from dev-lang/erlang/erlang-23.3.4.14-r1.ebuild
rename to dev-lang/erlang/erlang-23.3.4.15.ebuild
diff --git a/dev-lang/erlang/erlang-24.3.3.ebuild b/dev-lang/erlang/erlang-24.3.3-r1.ebuild
similarity index 100%
rename from dev-lang/erlang/erlang-24.3.3.ebuild
rename to dev-lang/erlang/erlang-24.3.3-r1.ebuild
diff --git a/dev-lang/erlang/erlang-24.3.4.ebuild b/dev-lang/erlang/erlang-24.3.4.2.ebuild
similarity index 100%
rename from dev-lang/erlang/erlang-24.3.4.ebuild
rename to dev-lang/erlang/erlang-24.3.4.2.ebuild
diff --git a/dev-lang/erlang/erlang-25.0.ebuild b/dev-lang/erlang/erlang-25.0-r1.ebuild
similarity index 100%
rename from dev-lang/erlang/erlang-25.0.ebuild
rename to dev-lang/erlang/erlang-25.0-r1.ebuild
diff --git a/dev-lang/erlang/erlang-25.0.2.ebuild b/dev-lang/erlang/erlang-25.0.2.ebuild
new file mode 100644
index 000000000000..d08bb337a5c2
--- /dev/null
+++ b/dev-lang/erlang/erlang-25.0.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+
+	# bug #797886: erlang's VM does unsafe casts for ints
+	# to pointers and back. This breaks on gcc-11 -flto.
+	append-flags -fno-strict-aliasing
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
index 92318d051bff..211d1dad47b4 100644
--- a/dev-lang/erlang/files/epmd.init
+++ b/dev-lang/erlang/files/epmd.init
@@ -7,7 +7,7 @@ pidfile="/var/run/epmd.pid"
 command_args="-daemon -relaxed_command_check -address 127.0.0.1"
 
 depend() {
-	need net.lo
+	need loopback
 	before sshd
 }
 
diff --git a/dev-lang/erlang/files/epmd.init-r2 b/dev-lang/erlang/files/epmd.init-r2
index 52f6d72b0fe7..08a230ec15cf 100644
--- a/dev-lang/erlang/files/epmd.init-r2
+++ b/dev-lang/erlang/files/epmd.init-r2
@@ -12,7 +12,7 @@ command_background=yes
 pidfile="/var/run/epmd.pid"
 
 depend() {
-	need net.lo
+	need loopback
 	before sshd
 }
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8d0db1e85f9f..39943ddced2c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,11 +7,9 @@ AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d SHA512 7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed SHA512 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932 SHA512 c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
-DIST php-8.1.7.tar.xz 11718520 BLAKE2B 145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3 SHA512 1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13 SHA512 4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 EBUILD php-7.4.30.ebuild 21310 BLAKE2B f2342deede65a4c66380a77b43d26ff7d09e31a13cac7c4d44d558f619e96498ca83941b0d550d33818dc48622bbc7c92f4535b0eccd39faa5a9035f1d88ccea SHA512 55fa2460ba1e9142311b78849884b45d2fe013d6592249746b7b2c0c0e1d09ce1264a8e205639b2f4a2058e07c7fd8ae132a0862200da11b0108ab04d45712d6
 EBUILD php-8.0.20.ebuild 21845 BLAKE2B 9bbc8fcd79a39502a50257ba00eb68abaa8313306d2554e3ade270203bd872fa66083a57fc10f6d4e7e46c8930efbfcf6de7c6562d2499dc262fb690db1aeb7d SHA512 af251c56145df7af13bbbcb73dce4f311af742245e5558cf062a6505526c77e45637adc99454471f5d30791ced2a9fd96438191bce71a1275df2137b85043c5c
 EBUILD php-8.0.21.ebuild 21852 BLAKE2B 11b093daf7700943d1349f68d2e0d6511b149eeeb0ea22669ad4df07cb743f6b27a1cc67a7bbf9d47a7aaba65daa44ad65755fe1185667dc7de9d4a0f8f40b57 SHA512 deb66942b30e5a2156218f9eee559d0ff9881e0d365e832f8e764f9febcfffa00021ccad3f500be60045deb6598a3f3b058eec3c99b886cbf2111c2c96c8647c
-EBUILD php-8.1.7.ebuild 21858 BLAKE2B ee7b59351797d0e5819b3216b92975bec678941aa41da1b204c06f8fe55ac4e66efb032293c0afa7927ee7a6ef9b9d51c91531e80526df2a0ad1274e4d6a114e SHA512 7f3a23f64e997439b250d43a25dece1e15ce1f722c10f11d107ffa19cb68b3baf2c89cc67db53c10fe10833d855b21f608df5cd43bf9e0091e81d3dcfefb7f13
-EBUILD php-8.1.8.ebuild 21865 BLAKE2B 95b6103cb61772929489b9fd318512291b26b8d956778ca0c8cfa080ea03af2d052ab9f9390435b451c6dc614b05f004c8202529434058e1dc8863ecf5dae112 SHA512 3aab5a841539a8eaebcdf85a4d01899317ef01d1f7cdc9abc58ec16a401875d4615a7654dc70232e71e11baaf02b1dbc3f214c2c4d04b2cf45cd902ed42f20f8
+EBUILD php-8.1.8.ebuild 21858 BLAKE2B ee7b59351797d0e5819b3216b92975bec678941aa41da1b204c06f8fe55ac4e66efb032293c0afa7927ee7a6ef9b9d51c91531e80526df2a0ad1274e4d6a114e SHA512 7f3a23f64e997439b250d43a25dece1e15ce1f722c10f11d107ffa19cb68b3baf2c89cc67db53c10fe10833d855b21f608df5cd43bf9e0091e81d3dcfefb7f13
 MISC metadata.xml 3150 BLAKE2B d9af858e1b9ee2b8d15a14761a86a5318a47496c892036aa8a198a008b0b627bf43772ad189c19bf73a4972ba2ff19687f85cb627bf097603dd3f531b71edcb9 SHA512 7ba0a8b9c425c1becb0931725a18f5831cc1ff4a03bcfa52cb78c3af1d1d5f5de7247840e1587d236528f14b9fb0b4aeb2b5dc3310189e667512d33a7fe022ae
diff --git a/dev-lang/php/php-8.1.7.ebuild b/dev-lang/php/php-8.1.7.ebuild
deleted file mode 100644
index baff332bc988..000000000000
--- a/dev-lang/php/php-8.1.7.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.8.ebuild b/dev-lang/php/php-8.1.8.ebuild
index 7e88fdac09a1..baff332bc988 100644
--- a/dev-lang/php/php-8.1.8.ebuild
+++ b/dev-lang/php/php-8.1.8.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 39c8bc30cf37..783a49877fdc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,6 +19,7 @@ DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da9
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
 DIST python-gentoo-patches-3.11.0b3.tar.xz 3320 BLAKE2B 588762fe2698a814d0cb89f84620d3ca4754347cb9af4f0eb36429a126ca2386b64594f16621a25e88d518986aad5f3ef3a84d9ce746f58b5cc6d112167c41d1 SHA512 026cb5cc2f3a1b17829fb088ca1dc9af03764a250bebb1fe518a6f7734f731a3f6cc5d83a13b6ca29dd6fa8ca5f0249a7ef0a641b939cd511d05cdc645b9171f
 DIST python-gentoo-patches-3.11.0b3_p1.tar.xz 10560 BLAKE2B 4a34de0595490b0e7fcff1761954bfa56f3f82cfdf5a26d739f410e355f9068ccb22a24af0c212543b1288682a9737e4202862c9d4db2f78d08a5a33f80c85e8 SHA512 a0e54b3dd16db8802b93b88ad50bb979b90052a53438fcbf8378288747b627133a492a9071600d7c11163cb9a61c4c80f9b1dd1fc843789aa7507488ff2c1337
+DIST python-gentoo-patches-3.11.0b3_p2.tar.xz 11496 BLAKE2B c640e64450199e7e1e3d49447dedc63ec3866c32006794d6e6873ec61c617b34b5fc81aa4760a0a0543cb0e1634a2243e02280d5716778a8c132054edbc5430c SHA512 5a0aa3bf54615caf9790f28e779d2d648875d484abe3e1c41ba220ca4fb6d8f6d78dee4ad350b9956de990acc7191b41a8073e0966ec8b99a0a100f8ccde344b
 DIST python-gentoo-patches-3.8.13.tar.xz 16004 BLAKE2B 5c0c6c9263570a467391e60c324d1dbc1e50ffda9cad1e204df124441b593146f18e5f1529eb7d385b35c5f4b9e597807971b6b66f7f8eef156ad87c9ad32743 SHA512 4ceb831e2d62bd73909b53a3b553b2cd73d08bcf2a1c92b47eaeb1221d40daabcaed14977265bcb265df00b6bf363dbebbd61a62dca4bf6ef40c6b911e980597
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.9.12.tar.xz 12848 BLAKE2B 5dd66fa94b136a463d2c4be3a5b7dfad770c3905467a1d81af02a35b2783ce7d614881c915ee8f8e764c1656963d6886d9c60c6e524f512e1bc496e42d01307b SHA512 07de63e47a8e547724099062239df8fcfd254f19d38be28131e6bbb094ffbab8483861fb6a5905e60d7fa7a1a5dc06785951fa31984ecad89516b0b742c47f91
@@ -28,6 +29,7 @@ EBUILD python-3.10.4.ebuild 11761 BLAKE2B a51875cab569a32b2f311b33c9abca0707e4c3
 EBUILD python-3.10.5.ebuild 11702 BLAKE2B d24101e18a5cc846de6ab9ec1578a8fb520b11ce4796dbce15314953202b5b02e79937c255948e31822b3c92eac36c4187d35904cbc43f64c86723dbb1d92140 SHA512 b3afd4afd62ae30eae2e48297417ca74bed11795bf463112a34ef4207e5bb055badd4d4d601113a946e6d1d43d66c7e8f6af281bc2372478170618c00f211d44
 EBUILD python-3.11.0_beta3.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.11.0_beta3_p1.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
+EBUILD python-3.11.0_beta3_p2.ebuild 13272 BLAKE2B 658ba9c4c5454b17b5000b554af41f47f2b0b57284f8b2239cb9d290171d626e7201f62c6d8e8042dd2d417defed0f23723464b957aaaffb7794c16fb5671257 SHA512 6a0d31c7d39112ad9f5b1971ccd81088078f524d07888d06a52d6853d0b6e62944f6c0729977fea85e1e18220f56612a8909dc58e7dd319e21bd8309933625ed
 EBUILD python-3.8.13.ebuild 10279 BLAKE2B dc700b2729f44840d33306fa0e50565d3c134ff74db39c83aebcc9994899479736bad15897e4135904bf7a6f4914c40e9b73caa64a0376aba10664d07c351227 SHA512 51b826ed0c99f777b684341141c83fca557942496a670aa4385f6c8c6379e445d7ec953c2f1b9562d5b4ee921038677f597c27fc8f355f076d72f66e6ae6ee9e
 EBUILD python-3.8.13_p2.ebuild 10221 BLAKE2B 3786b6c9b08b68fcbd778570d03889ff4f521fca8f10963e93e6f475df063226962dc9dca9bc0754f4afaa5b600bfe3f0c76f8bbbfe4fcc4f3026957d249db9c SHA512 bd4782819b48a06657dc0382655ad49d928f503f9dc7bc708c76dab34617975938f71644e7b4f54f9935c0b232016842bf5847d9c3c0a1aefc0aecd2052e85e8
 EBUILD python-3.9.12.ebuild 11522 BLAKE2B a1847835a23e863957ab089d1449a01c377ce9e1460ab3ed3453d863d6ad38824802bed23490dfa27c88615c1d70b8690d086997da143987657bf595d592ef2b SHA512 0e0d46e25e1f353152daddd3d67b870f393124a48e1cb9f9f464b3174d5254cba2580e7351dcba91558885cda7342e843a2e69631100bf6d15d791fadc3d8d2b
diff --git a/dev-lang/python/python-3.11.0_beta3_p2.ebuild b/dev-lang/python/python-3.11.0_beta3_p2.ebuild
new file mode 100644
index 000000000000..a77e97a2125e
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_beta3_p2.ebuild
@@ -0,0 +1,472 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_beta/b}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
+
+		# All of these seem to occasionally hang for PGO inconsistently
+		# They'll even hang here but be fine in src_test sometimes.
+		# bug #828535 (and related: bug #788022)
+		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross to satisfy --with-build-python.
+			--without-lto
+			--without-readline
+			--disable-optimizations
+		)
+
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+		MODULE_NIS=disabled
+		MODULE__DBM=disabled
+		MODULE__GDBM=disabled
+		MODULE__DBM=disabled
+		MODULE__SQLITE3=disabled
+		MODULE__HASHLIB=disabled
+		MODULE__SSL=disabled
+		MODULE__CURSES=disabled
+		MODULE__CURSES_PANEL=disabled
+		MODULE_READLINE=disabled
+		MODULE__TKINTER=disabled
+		MODULE_PYEXPAT=disabled
+		MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the --with-build-python value
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=(
+		NIS
+	)
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}=disabled"
+	done >> Makefile || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	if use sparc ; then
+		# bug #788022
+		skipped_tests+=" multiprocessing_fork"
+		skipped_tests+=" multiprocessing_forkserver"
+	fi
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Expects to find skipped tests and fails
+	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"sqlite3 || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		cat > python.wrap <<-EOF || die
+			#!/bin/sh
+			export LD_LIBRARY_PATH=\${PWD}\${LD_LIBRARY_PATH+:\${LD_LIBRARY_PATH}}
+			exec ./python "\${@}"
+		EOF
+		chmod +x python.wrap || die
+		local -x PYTHON=./python.wrap
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 94ae9b98a384..396bd65121cb 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,5 +1,3 @@
-DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
 DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
-EBUILD swig-3.0.12.ebuild 819 BLAKE2B bbc1eac8ae5f8736c8ccbe030ac7b8a09a20a499fefdcc9e4f036a7ed396214e5d1e0e64dbd05ec44b27db046b06ed83471c3e26bf8fee1d20dc99eed5e23771 SHA512 3f3dbd99405f91a1adb610a5950e8aa845a4c7857031dcf523abcd5781def93ae21f74b7fe65303ea68f637e754697904d23a12e20703663f4b90d11e3444d7f
 EBUILD swig-4.0.2.ebuild 954 BLAKE2B dfdf0c2db27888d3d4cfe83522e58bd9eeafce29ed01e2834f8e9b74ec1a699b55286f5945b020915c34e6d4aac3d4627eafd7e1be0e8e2effa1476065b768dc SHA512 1e04c8f7c2d2edb34cc082d21dfee6e24324392c598fcf6e91c8cae52b4df0ee18ea4e95611e19c1ba84b589949aee9f2f6e7a517dec5a9d025854be9eb7801a
 MISC metadata.xml 1019 BLAKE2B 1f6a79945d3bb92bd9b5c06f7b4e96c8c9f8f6e68d5c13890247d2c08adf46409a194e3198fb3df19f699a176fe92bebc1e7ba6eb0944a0db12c5e3271043552 SHA512 5ba26e3670ba852648a243f14efe096e52781418eb4d07cabc1bcf46efcd098d099ecbb3d504862540db796279fd855a581d60dd3b1de2f60e9d542e3ccb9b00
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
deleted file mode 100644
index fc8b43deec07..000000000000
--- a/dev-lang/swig/swig-3.0.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ccache doc pcre"
-RESTRICT="test"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ccache? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
-
-src_configure() {
-	econf \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		docinto html
-		dodoc -r Doc/{Devel,Manual}
-	fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index c7ed15eb9628..1d587cc3dcef 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby26) )
+	ruby? ( $(ruby_implementation_depend ruby27) )
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline:0= )
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 0f720df20ca1..062e39b5409a 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,5 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r2.ebuild 8481 BLAKE2B 2b1bd0b096e752254ac781b1c24578a387efb985c04b3c406aa085b8ad9c1bb49cc3d2f53932b0b9bfe83f4c9f4c9f931f222757746750ee1fe1b25ef1d9051f SHA512 083f6d89211e6cadc0f1f6e30884b194953925b99a9901c3d16cec2f37163dd4eadf3b28c1c1a7ac6897b0e870fa854dc3b3ab75743b3b0d3b3f76c22c9bb7c5
+EBUILD Ice-3.6.5-r2.ebuild 8481 BLAKE2B 49ce6a39311d13044f4272354f86b01764503d8055d2a6498c3378f548dd192a6d9087e3de0885be9a3700c67ff4ee463722e4940f1c290e80ad3b51ea89f710 SHA512 dfa7923cb7e9a0225eb0849b806ab1125fc08e71faf84c24d80910b91e86c12d62899842aba3a36f233fd2323029c3f4eca94901f98090dfb2ddcf67b72288b8
 MISC metadata.xml 471 BLAKE2B 50fef5d9314fcf793c140c97016a5af4ecb2b1aa5cc86e8cd1f961beb1e55aeb23d1228bf9dcccb10d54458b72766eba80c9b18d9add7928fdd4197577e58971 SHA512 65d2e51347c27ee6414f07a69ecd886d9eb6a18b3419a80e0e7022bdf127b03fca0cdb954c5a3d46dba29e40dc7973a7c5d6b8388af36702c3874e02589cad56
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index db8d71ae5f95..534fa7adb1f1 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 6c393a43115f..ff4754bd539a 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,3 @@
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-EBUILD hyperscan-5.4.0.ebuild 1367 BLAKE2B e41e77a0bfbd85c8b8c0a6b3be852ee557d2f650a942e43b01d38ffd98762551bc8d648d183ddb8c858f44f6ec0a633038cc336c07e60aeb92e42ae882818446 SHA512 60a3ff1533ce8fb5041781c885e185d4a32cc681f6e60e2103b833a0bce6f45ac1277bcf5fea35c11b169694e24cbf31b9ec9e67d4e600c64aaaf2c465f143a8
+EBUILD hyperscan-5.4.0.ebuild 1367 BLAKE2B 2d670f30be26e6d9d371672d5330bb26846be4690e01814b34cb521f40c937d42fceed913c9ee38f23707e62b8e6a5cb23e468c52568bdcee8783c9fa47f7163 SHA512 8fe488124416b05590e28af9205c43b262c4b190cc574286f53320490c3a77d16e6a84ec6b9a02a8bebf2cc479b46b75f0910f40dd690c43aa6be4ca1527337f
 MISC metadata.xml 471 BLAKE2B 0e366381dbc182a34196e84ef09ecc3f58d3287a57437443b46dc685f4c807b6f409bae7055a6123dc08287becf7ab4ec3c1b9817c337f464ce350e9b67232c4 SHA512 ea14de0dcff4f679d7bad0c4a5d3b56e592492ec9ee7ef3d180f1d8d951129d886d8def3779d9e8b8df2a6779d2a5e6063570a0a8ab3e87f97788a4f1306e5ed
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index 1f26f29e501e..e43fd5a3260d 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake flag-o-matic python-any-r1
 
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index a297a9c4e4d1..cdb58510940e 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,12 +1,10 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-22.21.23269.tar.gz 5475347 BLAKE2B dbac36c1720ee2a2475b64c3b61d144501fa4031ceb0eb69a3313cb78b5588926d029ad1916e2229fb8dea8d3450936da5b4e25b47814c854b05ec0bdb940943 SHA512 9ae38956dbff9764d85b5447cc03f7616319de463ddbf0dc5d4c8e8f8869f197b6045e446c81a902d8a5e7681e05cb5ac63e345b6bdcb74366b83619c52eb012
 DIST intel-compute-runtime-22.22.23355.tar.gz 5498680 BLAKE2B 81368ca9a5151305a5eb656ecca6a8d51129df2f567631d72fc5965c66b367e843bcf7b89a201702aa78e430d60e706079eba48a11cfd2b6a82e7a34d7ac5789 SHA512 72813ebd5de38d31f9ceb8087c38337d1bd0bb35256b86f3f3d7f3adc5ebe73b3cdc04bf653a522e25098b38c3b867f62fc3590eedf17e11d2fc03c2aa2b22e2
 DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b
 DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c
 DIST intel-compute-runtime-22.25.23529.tar.gz 5542277 BLAKE2B da718987fd3f3239b6cfc60914f02cc67b7174cb92f3a12e5d8f78b39631892b1c69368eb89590c3a7dfc9e930eb8254ec33c43028073cffac06bd3f718164bb SHA512 5ad80357a27cba76b95099ce5a0edc5271d7328769d6e84039fa94f94be99f02cf4890ee05702db18e28beba6fadea46aa2f0eb236ed8c27cb95bee075f2f6d6
 DIST intel-compute-runtime-22.26.23599.tar.gz 5574368 BLAKE2B 6302ced3e75d7d31a55c20e0c08f915fc2d3df149a843115ce925c62b50e2c9b47fc61ea48ad45a52967703f3d9e31ff23cd4e61d1666e5cf072d7c84c0ef416 SHA512 1ce2b0e9d3886ab51636265c7e1a91bbe817e27995d8e2d96fc4b67633c89f11232005f18f81a462f76fa67d9298fce51a335b9c4545d8b461019cd9e487b4dc
-EBUILD intel-compute-runtime-22.21.23269.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
-EBUILD intel-compute-runtime-22.22.23355.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.22.23355.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
 EBUILD intel-compute-runtime-22.23.23405.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 EBUILD intel-compute-runtime-22.24.23453.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
 EBUILD intel-compute-runtime-22.25.23529.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
deleted file mode 100644
index 0bbb025dbde7..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' from default
-	set -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
index bdc8a84baf08..0bbb025dbde7 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.0.2:="
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 4b71ae8d3fc9..2a3f1451eced 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.13.1.tar.gz 32077 BLAKE2B 8a75de1ccd0879db817cd67600f83e765e00eed175d73685331ea7f1cde07dabd5c49c9b0f3f039a2a0e6ad7f491fa34de62054494fd9c588e3bb530370b65b7 SHA512 ffb14595f23c47f71082b994eae01471f45e2e9e1ae9a8ad01df577b9445594c30173388beab016a92be9723638ca6e46b5cecddddc6adc97e9d212fc0fa23fa
 EBUILD libarcus-4.13.1.ebuild 1358 BLAKE2B 3cd3af7a1b25a29159f79f6cb5e5e10af181504206ed8cc8f100b4e8748e1853020c72b2c22bd0af288b3007475ef46e2f5713fb671257ff8ed28048cdc3c06f SHA512 9e63dccc5817e5e65f3a7e23a4db9b1d5490b4f8002f7c1bf70c2afa2f7c6a27e0012411a7d547d5bfaeb06ce7ebd72bf906d9d43119b97f7a7c88ecff5bfcbf
-MISC metadata.xml 1286 BLAKE2B 149e6008ee050d64c46009c12f18dd2e18234e4f19c1093fd0c557cc3d9369b547b07f7397975ab74b58d96ce39210f6a213b2f750ac2f844da579ff9f4ba8e3 SHA512 d6efb7fab1d6072cf8ad1ce5d2a33956eb9a8ac78992a434201d89de444b29382223e91f3c25475128a07fc81cfd4382bd396f9f16044f33b5ec4cdac8612b0c
+MISC metadata.xml 1054 BLAKE2B 489d56cbdde162445a89886b966050261bdc5ab27a8bd20d17122d3413eb1a3ec08f12163852dcfe955d9507228e762e5e71ae402806bdb2213eb38b88af07fe SHA512 6faa62e4439e21f7a42638282cb95298bd4e0736595616294572bd5f5a624ca919d0f476fe75b1f5fae59e9f438755e8376f66dc4091a6f70560d0722736d6e8
diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml
index 9a422ca8d704..777a4fbbb00a 100644
--- a/dev-libs/libarcus/metadata.xml
+++ b/dev-libs/libarcus/metadata.xml
@@ -5,10 +5,6 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -17,10 +13,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<longdescription>
 		This library contains C++ code and Python3 bindings for creating a socket in a thread and using this socket to
 		send and receive messages based on the Protocol Buffers library.
diff --git a/dev-libs/libcdada/Manifest b/dev-libs/libcdada/Manifest
index a45ced51bb0e..2622a43ee16b 100644
--- a/dev-libs/libcdada/Manifest
+++ b/dev-libs/libcdada/Manifest
@@ -2,6 +2,8 @@ AUX libcdada-0.3.4-Werror.patch 688 BLAKE2B e4c6bf7c8df550a2dbafaab78b9933e39c7c
 AUX libcdada-0.3.5-respect-CFLAGS.patch 850 BLAKE2B 84a52e62571a2f4fb9090d07de5abf3cd6865b698d8c30a6d78d80dc01ee76806a931e999c409d24ac4ccbfd884b5dcd933820801b5aedc1987c3be1e387f377 SHA512 d966ffc87dea5d5cba4a82fea2da401baf5e4cefb17337c955dd86347a240b637f22c2965d58562c81b6b6b65c5b04e606bba887d03e2f855b1ed8267d82c248
 DIST libcdada-0.3.4.tar.gz 1772957 BLAKE2B 5a7b24e7e033807586a30beb35a304b37262e8e673a02f307af63606b2119e3c76b2ed90cec6f494cac26f77aaafd1756d69c5043cf9adfd6a42cd0db76b4298 SHA512 363f2ebe9a054a6356040bb68460321ffb6dc0f66dfd2f95d275864135bed715e12bb6bbbffe11d665020a119033cd80d6bf323020760339664f1b7a4f1ae9ca
 DIST libcdada-0.3.5.tar.gz 1776937 BLAKE2B 55280e28d2fa6235ac95020b07853748a4551f1c1c2e65b12585064c4fa952dd310b54d5f95f986cea12018d452e1fb086d8bc3c944b169d5aeb280b78f25007 SHA512 4f3d022e54573c4dd0a39d8ef7d097bb209834ba56ec30003ef257e0496c7a08e50a432d0a4a40f019f06feab806cab81ee5ace9c92193266d5ec82cddad3269
+DIST libcdada-0.4.0.tar.gz 1777257 BLAKE2B 26e24fa513ab4a290a7632b4f56c102dc45cd9d34d4a7b7464f58aaee596b5ac3c8172080144d3f3c5cbcf5790f29e74b020f11cea943223e5933c2a7db66f8b SHA512 370a40a070df6783b5f44373bd09751660d51698095fa0ace38943a0331f90a55d131de50180b9ca9597361b7712dbcb350fde77a0e0489c47e4358fec61458b
 EBUILD libcdada-0.3.4-r2.ebuild 884 BLAKE2B 852811e2ae9cc561f2ef0698ec08102dd173deb564be61ee13d4675caac2bf55e1469464a2d6e6db3662b433aaf7f80a7e3fa72ec71398a0cb8c03bcf2deb211 SHA512 b72e444b3eeddcbf9c79a381d7a111b015fcc8ecf25e5f73d33857ca06dea70a390a4c821cf42f83c21d3cea6d5cd992a1a78228f8675dcf2bb39db4595ac86d
 EBUILD libcdada-0.3.5.ebuild 991 BLAKE2B 34b2379bdb5bffb62b94519fc6f3425f711d78ad3df917540ccdec85c01e2a54794fbe970c020f40f8353bff48db78118f8fefb6f48256285f4c6770dd97e452 SHA512 89e4be17b9e747b6ad328db74a2d31f5cd0779ea2511d14757063b2e906740a1d89b46e3bf69b5c709712c869b9d3f9703a5eeebbf399ce747e36c7cafdfb88c
+EBUILD libcdada-0.4.0.ebuild 990 BLAKE2B c52b266a09883cf2ecb52a5b0cf101926e35950b81a35c1a08ece7a45ac44f10d34b123f5e16f1602cbe334c11f81d91f34b75abbc7ba4cf95259834d7e45ac1 SHA512 3d13509e4d44e8bdf0d88666db061e257f22c478aa660b9516abf4b97ecabc5bda9d03c3ac57fecddb9b397f979f0310e6c9be21da2bc959d66ee08eb557ac24
 MISC metadata.xml 298 BLAKE2B dc523eb0719867c25f38bd413a4229c4b81b1d347184ce3574d32f96691fa907d14ee54e2f0fae3e94006b3465f0c8fb81c33818ec627d2028571b4d14500292 SHA512 5d9f732d34ef76b98a7366339bcfdbe1a3ef40fb49ff6c804d82f0b089fe2559f6cd26406b2028b49caafdbf0b57ffe27750f34143865fe3cb9b56041898a143
diff --git a/dev-libs/libcdada/libcdada-0.4.0.ebuild b/dev-libs/libcdada/libcdada-0.4.0.ebuild
new file mode 100644
index 000000000000..6710394643da
--- /dev/null
+++ b/dev-libs/libcdada/libcdada-0.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Basic data structures in C"
+HOMEPAGE="https://github.com/msune/libcdada"
+SRC_URI="https://github.com/msune/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.4-Werror.patch
+	"${FILESDIR}"/${PN}-0.3.5-respect-CFLAGS.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with test tests)
+
+		# Needed for tests. We throw them away in src_install anyway.
+		--enable-static
+
+		--disable-valgrind
+		--without-examples
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index a9be321fd4bf..682fad934cda 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.13.0.tar.gz 151775 BLAKE2B f8a8b59b361ffc9b54e0047e0cc3824e2a92cf341aa9664712d020e07e5f2facda6f2d1827998c4af0958a3b05070738a20d93d7723a2f3708e601b70474653c SHA512 cd6e4cd696bcbebe5aa6a53f5222fbb8f982ff21d165adcd8854769b19df2d15ea6287100ba09ddd85ac80d3f86dbfae9ac050ee50f082223bf0acb542413d8c
 EBUILD libcharon-4.13.0.ebuild 1746 BLAKE2B 8398f3a32823f17eb7d7c20da8d6a80c233ca9064d005b585fad25ad42e28cd443165801bfac246424fa2714eb0bf32fc2e7f5811ed55686e3a9c7454979626f SHA512 c3f9a56031cdd4e2f252c68fe7c3fa7f1821775250aea272ca9414f10a344557df872333eea1614cf241abf7379eed7311c25bdc5e7d427dc362101aa2abcc5c
-MISC metadata.xml 1140 BLAKE2B 356713d6a644186b8fda5d9fd9587a74a605aaa638217c62dd9f0657859322c66015d25a5b5335dbe02fcf2492ca7dec0d5e7decd5a2d4602b8b8ec8338f7821 SHA512 8aa76c3b4dc2246e0cc6c508149ff9913ef3310a3477d7596b9101f183d0e858cc3c11ebfd138cf1eb65e79c2800ad63cfaca63201aa1a63e36e5ef63bd664aa
+MISC metadata.xml 908 BLAKE2B 138b88fcb565bb5a76d0568c78a88e8dbc189b39009cf18e05b7404cc46bf452eb671eda2cddd1ff89f42264dbe1659f60b72488ef6764b7109ee3e26c354ff7 SHA512 715917d3322e3156c615ff4b9e60228ae0241668a8e7069d4af417e37e08ee9948bbf2974a494ac4d21ddb4ed81cf4211dece65c1719e825f629b8184746a5ec
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index 5c03eb1028ac..fdb12d8c03e0 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -5,10 +5,6 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -17,10 +13,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<longdescription>
 		Library to read and write several 3D-printing related file formats including G-Code and Ultimaker File Package (UFP).
 	</longdescription>
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index 3d1ce83e684f..b94b958c7ada 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,5 +1,5 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
-EBUILD libfastjson-0.99.8-r1.ebuild 775 BLAKE2B 260f5c33d47a2c07a92ac8b17674247e87cf19eb1aea0ff7fe9366652c03a8cd8a65198da62acdabb7c406288486ca72ad9931250efffd60b3872193e9f32e17 SHA512 9c8bdfebfbac330c56f6f05a2a4404c13b3e508fef2dd33ec4e7ac6c1f0fae10dbe8c706a63cf2cb9ca3750cf6c98e6531fb2664f31ff7dccbe9289c355bb975
-EBUILD libfastjson-0.99.9-r1.ebuild 775 BLAKE2B c5724a7228fe6fb0ca1da4ad664264acb5e062b0da14f1564dc7a6fd0c39587b2bf25ea2c76e06fd3cbc969989a149e5a7ec165cdf22f794830c418faef5a727 SHA512 6b1cb84cfa5c3cd200c65d7e08ceecb6beda411cf7a1034f72cb41694d0e73e903b21665f1fad7876ef22777aef3c8fdc50ff3455e385ee09d8c3380a819e1c2
+EBUILD libfastjson-0.99.8-r1.ebuild 776 BLAKE2B 2f8af870f812368bafcde0e870c040cb49324c95a4bac572d981d547c4dd97ad58499a6725091f9db6ed41b6eb63be7b29d346ac55b85931d2c7b76e1bdab661 SHA512 4911fc069c1b1fc759085412b1893ef3047007b6bf08319a97f3c1b41510eb0a22814254591439cd5ff8edf45413e1149282e06ee2d29a2b96854d5a938feaaa
+EBUILD libfastjson-0.99.9-r1.ebuild 776 BLAKE2B 332f758e56c0e6f00f16d8dae7155a876df4b872ee9a9a3345808fe1e1fbf0edf1bda7d779a5a2c6994efc1441085b78d3c6147d8b4a6a1250f454b8803b25b0 SHA512 e342d4b1e7003a9374218b47ade14ed3613c81e88a9c629056cd9432c482a67228bf6a5aa659a46a185966b3d6cf206d363b402c6cbfa88ff8767e5a364b9ed2
 MISC metadata.xml 769 BLAKE2B d7d5734c90b908013bf01df55cb72fb2908df2189773692ff15d0f2ee1e162d31cae68394322050950a1774919f48c8579c625a697d811e53a80fc36e074d65c SHA512 547ba3d80b494b311f5281f97ea6eff685fda5a02b876a551cb78b7aa6e5314239d5958c1419c8e861a6799ffc301af8e776a9f953c031e18f79f4333d848014
diff --git a/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild b/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
index 8d9063c9799e..38d0d58b62f2 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/4.2.0"
 KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
-BEPEND=">=sys-devel/autoconf-archive-2015.02.04"
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.04"
 
 DOCS=( AUTHORS ChangeLog )
 
diff --git a/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild b/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
index 56d3287ed32a..ab2e06437669 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/4.3.0"
 KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
-BEPEND=">=sys-devel/autoconf-archive-2015.02.04"
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.04"
 
 DOCS=( AUTHORS ChangeLog )
 
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 9b081998515e..61ac6d0af211 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,3 +1,4 @@
+AUX liblognorm-2.0.6-sphinx-5.patch 360 BLAKE2B c1435fe1799647785360d361fce735fd35f68e215784679cda9af6f39bde5ab4e3bfb721d7a77316c181c9ea60c59e5d76fddd7a2d61f7e471a212505fff914b SHA512 aae3e3d22310279ad7ed985725cefca23e9e36707ffe64f6173927f54fcb37228ec80373f072957026683cafed6d0a154f16cb23bfd2a09e5d72d94d96a33fb9
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 7c09269c28b58b3683cd9797da9afe33c4aa386819dffba2170907e6951eb193ddfcea204d880b69ce5e21d6aae247e141544a46cd7a14499e4490c6853a346b SHA512 a2d8cbb5a80101a40d1fc77d2852cf8fbfa3bdb30c0dc6ba296b23101e628f63fc88b82de467a5b6a6c1f26f561c08451990936986ec871ca28cb8c7b90e9c53
+EBUILD liblognorm-2.0.6.ebuild 1568 BLAKE2B 55ee8ee8427e2d5e96ea8dfd3cf63e761a2ee1762c20c957a66f89b9f7c8664ffdde6565ddb47564a4464a4ca469d3c53336341c295e0434b53bec0f63ac7981 SHA512 c1a08f910b48a054ff8404b1c498a71c33e897e5be161890c8fb54b654d969878b5e33c68b9d7355d0d90de983702d1f76dfa706d6ea17f1a5b460f0ab4b6945
 MISC metadata.xml 389 BLAKE2B 70d3d2a02b694e0a38c9e8f530c41a2f59e471067702c7edffced0d09ad7f4f15e8545541a29b86ddd4acf6d93d841a49f068134a25242f3cbbde01a3b9303d6 SHA512 26ca562d9885ce147feb94b831b2b70da5d4e04ec554356bc2e5b7293c7eb8edfdb9ed86b57ad02fd93b384053c1f6d038b496aebc68ed7771ec14ab90b34a6c
diff --git a/dev-libs/liblognorm/files/liblognorm-2.0.6-sphinx-5.patch b/dev-libs/liblognorm/files/liblognorm-2.0.6-sphinx-5.patch
new file mode 100644
index 000000000000..fde24f8c0677
--- /dev/null
+++ b/dev-libs/liblognorm/files/liblognorm-2.0.6-sphinx-5.patch
@@ -0,0 +1,11 @@
+--- liblognorm.orig/doc/conf.py
++++ liblognorm/doc/conf.py
+@@ -56,7 +56,7 @@ release = '1.1.2'
+
+ # The language for content autogenerated by Sphinx. Refer to documentation
+ # for a list of supported languages.
+-language = None
++language = 'en'
+
+ # There are two options for replacing |today|: either, you set today to some
+ # non-false value, then it is used:
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index ad0b574934a3..87b21e4997c8 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -36,6 +36,10 @@ DEPEND="
 
 DOCS=( ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${P}-sphinx-5.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index a4817f4acc5e..5f461f706d79 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,6 +1,3 @@
-AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2dc9edd527a6f9ecfa96ed70d3336f79b20c4ab8297062802465fa174f0adcd4d3ac81946eea8c1409a23b067278 SHA512 a73147873d0ddb3338608cb7bd4a44e6e333b46313e9326e7442b6b3c3fd4da97cbf93f8c92e517352d8828cc6ab6eb95a36e7fcaaa62a48774bc8f4a109b6ae
-DIST libmodbus-3.1.6.tar.gz 479565 BLAKE2B d9aecb57a0dd274c54a62f707c90c83f31500dd76aefc38c2615d9ce32df659613511e1b567cc385fd2b05aa473dbfbb65ae248d93bb7df2fbfcd7b16b7c5701 SHA512 2e39aea41b1cfb30239c3d8271c68841d645a44a15019090e2efd16979bde373c76532f992aa6a4587b95c65ed9829705f32e698e445df7c0e1d52d0d1165bce
 DIST libmodbus-3.1.7.tar.gz 490162 BLAKE2B 3ba8353fbf6849597b1affdb8dc318b8dc1e2f66b0c1bc9f5f3c8286d48609be6d85d84269d31510fe292a48010a72e7a678b748f3c03117a6230651fa80fe91 SHA512 e2c00bd06d0b4a16c8edbfd25a95695b782cf459cd69a7cefc1cfa5e4025f23b2896487b48876ccf2f8050e8cdef4a76d322c9752a43cd8dd2c634df9406bada
-EBUILD libmodbus-3.1.6.ebuild 720 BLAKE2B 4593d1070cf87c926f76647e0677806d952bbff61638ea3bf188f51b706abd6a62f9ab8479a5c871d92a84e874754fe3037a25af3619b19a2e971822367292f3 SHA512 22c24af582877496527b2d19f9aad00d10c23462d16a3d91cbc1f8fc60f493b82726f4b20cc13938fe1cb9703968fe09e938d8b00e4ea61cb943b39c7d8df033
-EBUILD libmodbus-3.1.7.ebuild 739 BLAKE2B 69b85d18436483a1d1961b708b20b43f3c7ee60c32dc40e2129d477dfe791fdcba429550c95d966f697a1df0359035daef794a82cfa6fcaa0405493232595e6b SHA512 25922e1252da77b04fbcbd15cd04221ed30a5b42286cf049a297b069d865a982c48bd047f1623eba8f5eca982ee97ae842b71a968a95bc6013204f3830277696
+EBUILD libmodbus-3.1.7.ebuild 737 BLAKE2B d4714e52e46107436b28ef23b9f361f69a4c18afea043cc382a5603b21f86a17d9abb5c8bc44e412f5fddda3b5bfe60f2c3a7477bc57e45aeabb59da440858c7 SHA512 f3191069b13fb718c30de512d8d8e33dd6747529392e00b25f7325eabe0f391fce17e766bfeb85f46eb117e4fd3c743d41d855fc9ba227e58e8b60e930f56b63
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-libs/libmodbus/files/libmodbus-3.1.4-doc.patch b/dev-libs/libmodbus/files/libmodbus-3.1.4-doc.patch
deleted file mode 100644
index 310e44afd1cd..000000000000
--- a/dev-libs/libmodbus/files/libmodbus-3.1.4-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmodbus-3.1.4/Makefile.in
-+++ libmodbus-3.1.4/Makefile.in
-@@ -379,7 +379,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libmodbus.pc
- EXTRA_DIST = libmodbus.pc.in
--dist_doc_DATA = MIGRATION README.md
-+dist_doc_DATA = MIGRATION README.md AUTHORS NEWS
- SUBDIRS = src doc $(am__append_1)
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/dev-libs/libmodbus/libmodbus-3.1.6.ebuild b/dev-libs/libmodbus/libmodbus-3.1.6.ebuild
deleted file mode 100644
index f83064f68a58..000000000000
--- a/dev-libs/libmodbus/libmodbus-3.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
-HOMEPAGE="https://libmodbus.org/"
-SRC_URI="https://libmodbus.org/releases/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test doc"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="doc? ( app-text/asciidoc
-	app-text/xmlto )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.4-doc.patch )
-
-src_configure() {
-	econf \
-		$(use_enable test tests) \
-		$(use_enable static-libs static) \
-		$(use_with doc documentation)
-}
-
-src_install() {
-	default
-
-	use static-libs || rm "${ED}"/usr/*/libmodbus.la
-}
diff --git a/dev-libs/libmodbus/libmodbus-3.1.7.ebuild b/dev-libs/libmodbus/libmodbus-3.1.7.ebuild
index 2c57eee72ce7..0cc9f045c687 100644
--- a/dev-libs/libmodbus/libmodbus-3.1.7.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://libmodbus.org/releases/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs test doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 2124c72544a5..da251d7d6572 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-4.13.0.tar.gz 100723 BLAKE2B d631c572e20fcf92cb2053959fad7c806b18981eaad7a0ad1efb52870a7f5874459d4012a7583be8bcdd7cbfad863dea9c4f8c13579269db3ea3a3cf92383b4f SHA512 a446131c0bbcc34e55c093032af823b9750797f06297bea9fd4d64838e793811e71679a1f6ae99be9fc9382a23e8763140147c7a6eea0a310f6f2d40b53be3bf
 EBUILD libsavitar-4.13.0.ebuild 1750 BLAKE2B 00c423703ff17155641b8fa101dc1d557b26e44c2afbd568b929705681d65008b56898558e7538fe1e662200d39281f924de0d1637f4ed3d04a947ffcb237703 SHA512 44c940c74668938c1a49177fc2a12ef2eafb577af8a43e0b5af4fb7b2ffcc25293f2ed139892ad5762ddfd9822f810e4c51827806959cef150253ab6d25f148a
-MISC metadata.xml 975 BLAKE2B 0d0faa17d5fad674babdfcbb4da1366f0a25eb8e28dfd091c006da263b5915b1909d2843cf9eb2cd8ae6205c56bd9b7fd3ac0d39f7594217c69f9b3cb727bc66 SHA512 91548b2cd344eb43f8b9e2e7596d86b9eec8c856c60dd5b41710d53da1e224d7c2c83283fe04031f7e0ede2be92bed1ebb46b3e897289d7b5a5de5fe93a6f1b8
+MISC metadata.xml 743 BLAKE2B b6e818e64f9ae62c439df6dc66bc906107cff24f54836f2b1c9cd0cc40a663773a3e07844ff4ff33ce4af2f72c006e86702472a6352c79765900ffcf547571fd SHA512 013a79bd8494ed9ac7b901d61683dffe55d14d2b60b855d3fbdc1199c06dcb8ce3878086641184f3a9e2ee1cb8dca3fc8f05f4ae81fa005f2029fbdadf5b3f58
diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml
index aae28f3e766e..7e62fc47fc34 100644
--- a/dev-libs/libsavitar/metadata.xml
+++ b/dev-libs/libsavitar/metadata.xml
@@ -5,10 +5,6 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -17,10 +13,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 59ab6009b2d3..03accaa4c801 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,3 +1,5 @@
 DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
+DIST libstrophe-0.12.1.tar.xz 398492 BLAKE2B 9f0e06952603d51a0697366a83d6fa80af09161858d87bee8cfd95786944a58ad1551155b8b7a982646f775a695432822f33b36c6e52161db145dca98050689e SHA512 54e255f756a6705dc554ce75dd6b4ea889822774ca38042548480ea026a7f4d411b4ba30f3aaf88776a0d8437f51eb07fb3675ddbfb0afd661d5f965b280dd52
 EBUILD libstrophe-0.12.0.ebuild 1251 BLAKE2B 98d7083591a20d015b84e5b27a8f338a8ac0c4e10f2fee56f4da13f84f40c965c69851473abf0b3341f4004254ff4fa2c1c539086ef098d12e364a11e623a4ad SHA512 cbbdcfc9e5fe30ba3374e85460d206c754278552b1bb50eb087d60a3541b0043ff77ef8751828c995afdef804bc339ff71b97ffa0b87314a5138ccb3df074571
+EBUILD libstrophe-0.12.1.ebuild 1231 BLAKE2B 98d52c2c1dbdbf6134814b683be8ca553620419612b1b28c0f3c8701fe3e846c5a78a9b59242f9e0468c2f1cab0fc80edc217f3d0bb5c473fe2e75fe677981af SHA512 a48e29ef06a4f22094c74bc55efc9f919a68524edb79de096e8c155d7de559bc4c88e2e93684dd2a3ac4d15a734241b89cbb7c5d3cd670e79ba1d444ef336627
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.12.1.ebuild b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
new file mode 100644
index 000000000000..a070ad9748ba
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.12.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
+LICENSE="|| ( MIT GPL-3 )"
+# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
+SLOT="0/0.1"
+KEYWORDS="~amd64"
+IUSE="doc expat gnutls"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+		$(use_with gnutls)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
+}
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 8624c2adeab1..f8f60df4a867 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,6 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
 DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505
+DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
+EBUILD libtpms-0.9.5.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31
 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721
diff --git a/dev-libs/libtpms/libtpms-0.9.5.ebuild b/dev-libs/libtpms/libtpms-0.9.5.ebuild
new file mode 100644
index 000000000000..fc15af9bf0f4
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.9.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library providing software emultion of a TPM"
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.0-Remove-WError.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
+		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
+		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
+		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
+		elog "TPM state file must be deleted and a new TPM state file created. Data still"
+		elog "sealed using the old state file will be permanently inaccessible. For the"
+		elog "details see https://github.com/stefanberger/libtpms/issues/183"
+	fi
+}
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index c2bcb61975fe..8dc3884c815a 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,3 @@
-DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
 DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
-EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
 EBUILD mimalloc-2.0.6.ebuild 698 BLAKE2B 3eb6400c93be33c1f752156d6e851ae072fcf9029b0d56709e793b84a65d8543c8a6ec729887f10b1d3d0b2982e2a7c789c3279962161725c01c474e91dac547 SHA512 4b6fa39b2283504cf306463614b3d6700ec0170b4c02317911056133c2cef9a7e106c1a874f86d555f0aaeadb01755e0961c905bc3510ad5172dce94c0e33b4d
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
deleted file mode 100644
index 8710584db2d5..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index b0baaf7f7537..6e169a68dfff 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,5 +1,5 @@
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
 DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
-EBUILD mongo-c-driver-1.18.0.ebuild 2348 BLAKE2B 2086df490db87af053a5d2e32691d5b87330538915646d3ebbcad177324f3afd1a40bc9f2883f8c5f404ce58b0eac749e613f276a4b20bd441c261f247fdef88 SHA512 c6ef3a4cc013078b7baef6dce9217a47a02c1d1cd1cdf969851efdedc48b27a4d350d252ce06600246ca1b43f7bb75d5d015f27a1f99bce10e9fa546fd2cd14b
+EBUILD mongo-c-driver-1.18.0-r1.ebuild 2351 BLAKE2B c95be6981201c645c95d1f32dea1ac5b4655ac383a5f2d1202c635fc43930d7511c47066288a5425d657988e8642c8b9593da3eff20784fe6f5ac9190bfb4988 SHA512 336e475077a030ae9de4409ccfbed7fe01d414e63cfb248ea95c45605f792dd2dda86a316a27f72f23679b59c6987cc7cb04fd442a116d0d5e93cbabd884810f
 MISC metadata.xml 335 BLAKE2B d7b8f44f6698d86dbad1ae9fc535f6c75acb827b07d32af1ba02c94da5196f00f1c3c2d2f519ca388d586867c6b033a3c53d3e3f5856ba32efed730c34316642 SHA512 7c0bf1f1f5065e82ebb03a00b68d41888fbdf4b92c67b116e46016490fbc74c5a44ca8f8245217a7926e85f5d53bc3bcab7499d5ceaf4d4593ab9953e36fc2a1
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-r1.ebuild
similarity index 99%
rename from dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
rename to dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild
index 2969c22a9765..752bb1e91e55 100644
--- 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-r1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="x86? ( test )
 RDEPEND="app-arch/snappy:=
 	app-arch/zstd:=
 	>=dev-libs/libbson-${PV}[static-libs?]
-	dev-python/sphinx
+	<dev-python/sphinx-5
 	sys-libs/zlib:=
 	icu? ( dev-libs/icu:= )
 	sasl? ( dev-libs/cyrus-sasl:= )
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index e1341f6a33a9..e8e63b7f1ecb 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -6,6 +6,5 @@ AUX ossp-uuid-1.6.2-hwaddr.patch 4535 BLAKE2B e91cb616e6f60f410e6d214359da6f785d
 AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee6a624dc96e226f9f696e5db9380b5132a0b3b0fae528fdcd6d8281f60fc94c34d4f67a4525399ff85310c243b0d72 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
-EBUILD ossp-uuid-1.6.2-r6.ebuild 2173 BLAKE2B 4b519dfedca832601ec5c253f3c05bc9f591116dc651fe7d4b2ae77f6a77a44bb10acfb512164e5cf43ecb4bd86270116e8ed4c77979d4411021da03c7d5f958 SHA512 b01c2e04a003a85a469417c973bbfd03f2a1d164003a50c137c8f08e37cafbb8f9260086edcae22c6f8045cf55c2787e649ceb285ab7bbafe8998b5910fba78a
-EBUILD ossp-uuid-1.6.2-r7.ebuild 2159 BLAKE2B 6230fdb550a4411bd685d6545a152916c1e01f1fbcd2462fb169a8058dc87f6911f2ed3bd904e5a09a365cfc11f133e05fca64cc4a8824a749a4882fae698555 SHA512 b197e756c7242c781ef747ebca7191381c66d59ede4882fa08cc7a312073c514fcf41edaff0767043bdbba3330fe2a9a19c05f19426d3d7cd955591fd4ba3fb5
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2176 BLAKE2B 1ad5acdcea2441b0871535f059ab129017bdd92ac5f5d58012d67320f53feba0097a7bdb4cd5b239d2ab304a9290394e7703dd8a64c59376a2bed0177ff0f3a5 SHA512 2d5edd80e85d22fd4294acc193387a62534d7ad7d8eafb43db88839fc08bdf4aea822e23a75a746a64fda0f2e85a2746d543f3843fddf81c82a7e911f9f6f72d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
deleted file mode 100644
index 7afc78c9b5c8..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="uuid-${PV}"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+cxx perl static-libs"
-
-DEPEND="perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	eapply \
-		"${FILESDIR}/${P}-gentoo-r1.patch" \
-		"${FILESDIR}/${P}-gentoo-perl.patch" \
-		"${FILESDIR}/${P}-hwaddr.patch" \
-		"${FILESDIR}/${P}-manfix.patch" \
-		"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
-		"${FILESDIR}/${P}-fix-whatis-entries.patch" \
-		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir="${EPREFIX}"/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd perl
-		# configure needs the ossp-uuid.la generated by `make` in $S
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
-	default
-	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
-	if use perl ; then
-		cd perl
-		perl-module_src_install
-	fi
-
-	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
-
-	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-
-	use perl && emake -C perl test
-}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
index 33616b0f8acd..6aa8c6c2d688 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+cxx perl static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -83,5 +83,7 @@ src_install() {
 
 	mv "${ED}"/usr/$(get_libdir)/pkgconfig/{,ossp-}uuid.pc || die
 	mv "${ED}"/usr/share/man/man3/uuid.3{,ossp} || die
-	mv "${ED}"/usr/share/man/man3/uuid++.3{,ossp} || die
+	if use cxx; then
+		mv "${ED}"/usr/share/man/man3/uuid++.3{,ossp} || die
+	fi
 }
diff --git a/dev-libs/qcoro5/Manifest b/dev-libs/qcoro5/Manifest
new file mode 100644
index 000000000000..dbb6465d9793
--- /dev/null
+++ b/dev-libs/qcoro5/Manifest
@@ -0,0 +1,3 @@
+DIST qcoro5-0.6.0.tar.gz 122618 BLAKE2B 1fbd97d8b9897e9dc7408b2bf667064a3ec6326778c44472689e180af9eedc524236c5104b11a117fa8650f042a4ee3bd2b165e44385a829e8638c5e98d293a8 SHA512 e2e0219156a5ba693c935323c45c7414ce0f8d1773986ca63682812678e2b35146c76fa033ef791facfb57fa67fb96727df75ce6ecdae1e232be42f376973a8d
+EBUILD qcoro5-0.6.0.ebuild 1207 BLAKE2B 749f94cbd38ba988957197862ecb48fc24b3832ee9b4c254e2ba53c4b7356c05d025b9ba8b1b45d12babaa363fa0af7a75edc8243f74f38465d31de1afff75f9 SHA512 8b6e8520eff40214c022bac75c2057d87de2fc47014593bc9023f041eb9b9f9b514811359c46417b0a6ca7ca44431d9d266926acab1a9774a7f60e6f774282c4
+MISC metadata.xml 483 BLAKE2B cd6ca8acffb789b49e66d28dae68abadbd50ccb08bd229840481f18b4dcdda586b52ac975a1b826b85672ee4a6759d8cbd285c9c7ed91a1b60e341f441ad0455 SHA512 2bed7eca8178dfd4c6b7c30417ddfde30250926aacb7718e1f81c35a29fff079ea2dbd4c2f3270a339ee5d3fb59ddde875dfb0dc41be9149cf31e88e0f00c249
diff --git a/dev-libs/qcoro5/metadata.xml b/dev-libs/qcoro5/metadata.xml
new file mode 100644
index 000000000000..4c518fdf8940
--- /dev/null
+++ b/dev-libs/qcoro5/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
+	<use>
+		<flag name="network">Build <pkg>dev-qt/qtnetwork</pkg> support</flag>
+		<flag name="websockets">Build <pkg>dev-qt/qtwebsockets</pkg> support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/qcoro5/qcoro5-0.6.0.ebuild b/dev-libs/qcoro5/qcoro5-0.6.0.ebuild
new file mode 100644
index 000000000000..4efdf36d5d58
--- /dev/null
+++ b/dev-libs/qcoro5/qcoro5-0.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danvratil/${PN/5/}"
+else
+	SRC_URI="https://github.com/danvratil/${PN/5/}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/5/}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="C++ Coroutine Library for Qt5"
+HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="dbus examples +network test websockets"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dbus? ( dev-qt/qtdbus:5 )
+	network? ( dev-qt/qtnetwork:5 )
+"
+DEPEND="${RDEPEND}
+	examples? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtwidgets:5
+	)
+	test? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qttest:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_VERSION=5
+		-DQCORO_BUILD_EXAMPLES=$(usex examples)
+		-DQCORO_WITH_QTDBUS=$(usex dbus)
+		-DQCORO_WITH_QTNETWORK=$(usex network)
+		-DBUILD_TESTING=$(usex test)
+		-DQCORO_WITH_QTWEBSOCKETS=$(usex websockets)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+	fi
+	cmake_src_install
+}
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index ea6da0643df9..3e07e2ce0412 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
+DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
 EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
+EBUILD tree-sitter-python-0.20.0.ebuild 290 BLAKE2B 684139dc89752f3e9610de4b72ed0c5e327ec1cec4fe9f6ecc22bafc1e9853f508dfd415f7cb868d91519c5c1605dba9d4aea9fa12dc41539dd055695b292058 SHA512 fa9ed2ea177cc82b4fc4f0102cf9950cf57d8c2515a218494fdc5ed77329aa4a63fded54fa47bfffd93d1cca4423bfcdec030cd2ba5f946ff5b16697eab7e0ac
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
new file mode 100644
index 000000000000..8088400764ad
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Python grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index cbbebe2c83b7..77e615a60dcd 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
+DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
 EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
+EBUILD wayland-protocols-1.26.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
new file mode 100644
index 000000000000..fd84b9649f01
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( dev-libs/wayland )
+"
+RDEPEND=""
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index d97171ae8299..51412b567cb3 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,7 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
+DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7061 BLAKE2B 8ab8e0fa2a6ab5bd3bf0298e2afd9dad783abb9660ac104a16046922838b23592c6b7099a47d113039d60be14ab549aace5da5ff602284e48242c4a027429a3d SHA512 57ff3aaa344665e81859569e5d9db86d5efe5c901ddc4c2f5f2970fea0ebe60f62252db1428b74c613da3acfa3f193f45ed66f655b29a562e82c37960fac32d7
 EBUILD xapian-bindings-1.4.19.ebuild 7129 BLAKE2B e9aedc0bc645d330a06dceebd31b589847cd2620cf8f6d7fe26842c55a569aa71537d284f83868e365b1c57da8778f389a6f216ebd31c1a7b1f7a44420bc2f7f SHA512 028b24619d045755f386c4ff1b80fed6a108a0375c7bfcfd5b8eaeeaac4ccea1dfd449207a582b4817f7f4382be7908117dc9192691449560a96df093643e806
+EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
new file mode 100644
index 000000000000..b7ecddfc2361
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-4 php8-0"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.20
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-lua
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 27bf7002e444..2e9de99405f4 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -3,8 +3,10 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
+DIST xapian-core-1.4.20.tar.xz 3003788 BLAKE2B c4bfa4af9112a206b14c8c2f4a76eb4c1267a752130287b6623233d3a09783b903a3275b2ec275f38f1d195119c730565a31ed303b8e2dedefc42cae10387600 SHA512 e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35
 EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
 EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
 EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd
 EBUILD xapian-1.4.19.ebuild 1888 BLAKE2B e04ab49292c2d5c9182a0088ea355ce54b85207cddb02fad9beea9dbaf2acc864a36d8664fb4a8f7c6773e11bf6e89f769c941bd3651742477963985af530800 SHA512 ff5a7091c49622a037f1565cf829c6e3b74228222bfa2634c6beaacae18a41ef7f42465c4e63cfded04e24c25da0265389462c37f742f130e249a4002199be0b
+EBUILD xapian-1.4.20.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee
 MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5
diff --git a/dev-libs/xapian/xapian-1.4.20.ebuild b/dev-libs/xapian/xapian-1.4.20.ebuild
new file mode 100644
index 000000000000..d50c34543512
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.20.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf ${myconf}
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.330.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.330.0.ebuild
new file mode 100644
index 000000000000..e353a5bf65fd
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.330.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=0.33
+inherit perl-module
+
+DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-perl/Crypt-OpenSSL-Bignum
+	dev-perl/Crypt-OpenSSL-Random
+	dev-libs/openssl:=
+"
+DEPEND="
+	dev-libs/openssl:=
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Crypt-OpenSSL-Guess-0.110.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+	)
+"
+
+PERL_RM_FILES=(
+	t/z_kwalitee.t
+	t/z_perl_minimum_version.t
+	t/z_meta.t
+	t/z_pod-coverage.t
+	t/z_pod.t
+)
+
+mydoc="rfc*.txt"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index d67aa14a5ff0..789c0f18cba2 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -1,6 +1,8 @@
 AUX Crypt-OpenSSL-RSA-0.320.0-openssl-3.0.0.patch 2854 BLAKE2B 7aeb7a91b974b7117d278e74cb68a8525fb43f3169158388ef1ae79dda75178b6fd1d798921ba2677f99671b0bb690432b3627426bf71732318017a7bfd307c3 SHA512 1a32525d51959e0fd28d0504996f536cec7eb5b54a23cf657ffecc03a13c533e270926c95546a1a0197dceda1809d7440d594d7d6e345fb422644825b735d3ff
 DIST Crypt-OpenSSL-RSA-0.31.tar.gz 25856 BLAKE2B 172d48cd6cc0f3df2c1c1684897d8ee376663cb366a1e28c13e4af603b2b985d542f83284112be5e4717a3a13a512926b4413b5a8f08f7ed613cd9929683cce9 SHA512 e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab
 DIST Crypt-OpenSSL-RSA-0.32.tar.gz 24805 BLAKE2B 419b6a2e778fa10a6d68a6932d0b816f1c8ea4db0cd283efef4a4e684ea3468bd1133ce8825b388d1e3a4b4a990253aa44af892e4f89d71b46917f0cd7cb1fbb SHA512 2972611a8fa4e9c44fd09c9e7fa32f0abd377230f14dcdfa99edab87bba2199c6a0cab4d1e08bdf3057959c0efd3343eb989e46f4befd572b15540e59f1e3c64
+DIST Crypt-OpenSSL-RSA-0.33.tar.gz 29010 BLAKE2B 4a25d93a351b51fcab3df75a14aedf9b039cc5f5692c2e7fb32c616da25a83917619683dbbc0d4f8c38cfa80e73b5af138c91a24a72be8830c37df06bcba539c SHA512 7bfa802ec41925ec9fa6937c5eea0d21f6f554a1d1d57ed679ed03b260cf08c0a397df11880de6d67abacfd843ad2c4f28b20ac58d80e183c2a83c91deb926bf
 EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 846 BLAKE2B c8940ee931f45736cf7d158154cdde4c76a6c64474f3183bb8cb39dd1164032dfa8d1e73d43b1ad666865a07135842de49b6d4930f9fbff83ad1867a7f437653 SHA512 be73ffbc70a235ab89d273908709fbee87158c49406f958af453e81264f9911eee067621700e3dd5d0193c7b9357942188a790ae73ddb995c03969f4ba3c0b35
 EBUILD Crypt-OpenSSL-RSA-0.320.0.ebuild 781 BLAKE2B ba094335acfc3f1126c59118c8f3efb6b993278527cb476a72e2cd5cdb77c751c2f4bf724a70a203a09c2cd09b5ab33c873b07ad326d9ca9b992a6833d0bbe69 SHA512 dbe496417cc2de68ec12372f99c3d99672ed87510bba9db63638b1059eb049447bea740369786d6a7f3d0bcaaed3ca86dc9321ce58d64f889fcba5634df08980
+EBUILD Crypt-OpenSSL-RSA-0.330.0.ebuild 734 BLAKE2B 67e720d361285e70c6b9d945d25593381d147b1d0da70db2449716655d8a26dcdf1332a9a6e27ecada1a9af1def36c50165f008e629a6cd8d4efee356e94006e SHA512 ac7ff7b7b371f7ca5adda86ab1e206b36968fb630c2a76129b5b497bedc435296f49bc6396da87c2bb2961f0dc938c9abad18967b001b6b1b787203a846a773e
 MISC metadata.xml 408 BLAKE2B 73d573041ec5bc601cc948584974012395ff1fb07b74c062266dc356b435b5f57e010a0ad86163f38ff64ed800bfb47ea250de1b82e618ac42d3317e5ea2a3ee SHA512 f59c8e6ab19bf9c047ca6df9c8e8403182117f51add298e9f6a37983fa27a54365f42c7898752bc86800ec2c5016e353458406256d77a7c7373284acf5e9b55b
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 551b7509d26a..a16384319248 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest
index 5280fedd03ae..5f70df85669f 100644
--- a/dev-perl/URI/Manifest
+++ b/dev-perl/URI/Manifest
@@ -1,5 +1,7 @@
 DIST URI-5.09.tar.gz 108897 BLAKE2B 3c8114d259e75d8da298c9e376a3a6d6f8f224c9348e9bd9118eac4a0144c6c37756ab4427f60cca43cc2b14a95492fa4ec7c1c7952871b6250a686cc27a2a37 SHA512 b9af77064abb8cb83900a02c18b3d5b8f840559f0f925be71b18bcdb4a24c40d654ccf9969d72b7d8930ea17ae4f4f4291fd327bb0b93c204c8f819a1776b8bb
 DIST URI-5.10.tar.gz 109471 BLAKE2B 8f2701bc78efccf13161318050fdd83f6ee51843b101c4135a2f434e4cd1bd7359eeca1708b91d7571128aa7098d43c70ff84d048656f978ad230b29faed7945 SHA512 6ce53b258c2f1115e58ca858beec0c055452993b83abf3ebf23784e00fcbe636f3b7a460a2016923f9fab0e0bbd112475048eb9671d6d1e1c3b4db33a503efb5
+DIST URI-5.11.tar.gz 113305 BLAKE2B 0a68623a22d38f9269839522f8f42ea4f7f817388de2fb43715bb138dd593541a23eb803705be9e687da6d644f1c426063ee0bdae85525242954be7bb453176f SHA512 d04dd1b4a00f7bc712433e789947dc11296de6376c73da30bfc1e87082b471d9d056d7bb6dcae11f452fdf87d3b5b69edf6d5782dfa461c5ebe1ee041f55d660
 EBUILD URI-5.100.0.ebuild 873 BLAKE2B 838b74280ee372d318a51c3d1159436f1e75df246a01d15cb102284b0c8ae63526a03bcc3070270bfa8b8e89799a4b20e9653ae2fc334df0ce899b5015b69de7 SHA512 636cee4f34384f3cf62a375e046f5dcbecdce0eb18365993afc2de47451bfe4b0dbd4e04dd01ddabfa2e55bcbd5c6303feb37838545e73e60b6184c24afbf9c2
+EBUILD URI-5.110.0.ebuild 881 BLAKE2B d1a3abc1f67e6dd3d50b70ff2cdf4f1f55f6aff1900d279752bfe3012b19f5a0f390f1a60f384d5014e2c33428f39cea2bfbfa64d4b4a7598aa2cec802cb76f3 SHA512 4f416ae8bb4a8df2beb64ac03b652a9367076682c0eda79d88133484b69f6cd1aa0a97ef1855871a26a6f83fca9d7cab4c1cf884144f3220d422ebbcc4b4643e
 EBUILD URI-5.90.0.ebuild 866 BLAKE2B 19e92618b0523503151a394edfdcc7c24779a47e5f330f4c5a71ae07938e639233341dcfdc73c0706b8a7b9d17d59a49f5914e154782d0ee383f2552bdec59ab SHA512 cd4f935b8bae0b9080d83579e2574fd0144ab5334d7b4ecc270a552b4e82f09482b2a2786e93eec28aabdcbd9b54f8121a4d54a7107b94e6bf9e109dabd6acde
 MISC metadata.xml 3395 BLAKE2B 7fdc51ea225b12429b44d0b48ea969f3a7378d58de09558d60dbd9df48e3d53c287cc7046ccca24591b167008af09c1c784c2ac5c7e0202718d976fc6275757a SHA512 86c198d458d1e0b6ceebd934ffaa017d83d6dafda1e4cdcaf8ebd073f5c7a01a8dd2a4fd56cc66501c0b3f7fff41caab241adea1c8f4a0ce5c3e7606ab7fc3ff
diff --git a/dev-perl/URI/URI-5.110.0.ebuild b/dev-perl/URI/URI-5.110.0.ebuild
new file mode 100644
index 000000000000..0e040144afe5
--- /dev/null
+++ b/dev-perl/URI/URI-5.110.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=5.11
+inherit perl-module
+
+DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	>=virtual/perl-Exporter-5.570.0
+	>=virtual/perl-MIME-Base64-2
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-libnet
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Test
+		dev-perl/Test-Needs
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 35c66cb7011c..8af09e7c01a1 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 9bc6196a57c4..e8af83bea78a 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -4,6 +4,7 @@ DIST PyPDF2-2.2.1.gh.tar.gz 5019240 BLAKE2B 31412cc136bebdf0288fcdf693540e2ae8b8
 DIST PyPDF2-2.3.1.gh.tar.gz 5077679 BLAKE2B 36a70ef9e10ebb6d5c50b713f539aad56b8ccbd94d279aa0b0dc41e9ef1c682ac21b04b4612771e386e8655aa812e11bdbe04363ebaa074a96ffa7059f500e62 SHA512 885d6bab457be594c7a715345f0d4c6f5ba1e34f422e3de42822f4886c0021fc799682e9d253f3c3f48f8c45d387ef431843e2f2f9c7e54c1402ef31b975c511
 DIST PyPDF2-2.4.0.gh.tar.gz 5119230 BLAKE2B a396f1e36a4ad74396a549fa6a6dd76b4a24bee66c78e52bd01b9d3ffebbf15698c0b1b30372fbc7224a815733bfcdecc7e7caa275de32f1a25f44c0e8276c9b SHA512 664f57132c6fa9d2cba324559de985b2c4de4a1f9b5d1ca4539cc9ae35b4296a0b3dac1d15ad069e3f46cc01b2b55d530c0fd5f70e6c41ce5461dfd0ebdd4cdd
 DIST PyPDF2-2.4.1.gh.tar.gz 5121207 BLAKE2B 387085ea028d7fcbcfd5fa4e5373b655e647548093638db66fa92d44b8771bb5342f8086ebca82e205cf56f1865778bc604f49a49b39af16d8d9e3466a51653d SHA512 430e73ee6965fd6b8dac9ce8b6ee232e8ea829a7dbdfe87aafd29ae24ab182cd3e568b447030a0c199aab9049a79ce2a5518ce7fe59b1d8ce533b1313a568fc2
+DIST PyPDF2-2.4.2.gh.tar.gz 5327738 BLAKE2B 5343d5b7c2efe2ed664f896b030a60ad8570ae8f481376e4ad9c865144b66d912633e4f83294d7f6399230963c02dea262cc247b10ca3c146ab24f823c0d57f3 SHA512 84a13d5b624ca8ca2dc4c474309ffa47d1770e1681ccb527f7fc1df37698037c224939dd062da004cbf7b983744afd3ab9adc9a610bea3f2f297e1ed5b708dd2
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
 DIST PyPDF2-sample-files-d7ce88b71820fccaaa4738aa37cbace51f3ed3d9.gh.tar.gz 5406263 BLAKE2B 69673ec380941f567d3630459dc610b1c3a58d5f2956138776412683a96292549107294775d236d1304c054fb91b238f42942a169a7bc862c0b721de647ad191 SHA512 a245de88952de08b45e483f05a1ed42a70a67c4215dd8c32a9b5d70bb64b01acc58ebb1cee677ca178eee8380528dbfac50d3a1a022f19039fa3a47746ddc2a0
@@ -13,4 +14,5 @@ EBUILD PyPDF2-2.2.1.ebuild 2770 BLAKE2B bc4cf142c90c09f025e2dee618cec6b8083be21a
 EBUILD PyPDF2-2.3.1.ebuild 3380 BLAKE2B 6ae19d28b0d7f9e64c61fc8cd7ac83a55cbfc99e077b651e986a08e12d90d7f2690924760261a1a05c32e30e9986c74b9bd28fb1db688ccb7d131944e22021d5 SHA512 ae711b3bb63d056ce3b2ede12f82f6e09a7363b3a053ee21020f6531a07c297a79042715c1fa2d2102a40e6f14f362bad80db2d3443a072d6a836a8f7c6d6ef7
 EBUILD PyPDF2-2.4.0.ebuild 3419 BLAKE2B bca63e5bb8f9ad093509f8b44818e424960e7c8cc93b72cf0549ec0fd32ef5b4986f1c62a8067138b027bac3b606b882415319e9e614ef2d125409a9362b8698 SHA512 baabd692fcde63b42705983d8db030b2fb8df068cf41e4e441e6df347dbf3358a914f27702c0e32a94b6af4e28b1e4f396a946ecf5fd9760288785e116b1d43a
 EBUILD PyPDF2-2.4.1.ebuild 3419 BLAKE2B bca63e5bb8f9ad093509f8b44818e424960e7c8cc93b72cf0549ec0fd32ef5b4986f1c62a8067138b027bac3b606b882415319e9e614ef2d125409a9362b8698 SHA512 baabd692fcde63b42705983d8db030b2fb8df068cf41e4e441e6df347dbf3358a914f27702c0e32a94b6af4e28b1e4f396a946ecf5fd9760288785e116b1d43a
+EBUILD PyPDF2-2.4.2.ebuild 3854 BLAKE2B 4a3462dd7e69a50288f11bdd8842994e05d9f539f816c934cce50cfe1d3495f373b7a6eb625329b9da46b8c063dc1f60cd091744c7a84aa79fd67c59b7f2775f SHA512 a4c463ef7a85ffcf86f7b1803ae0d18ac0550f06bd849f9d8d78ba5b3e7b590afee880cccc32ed478d24494b9822017e1b043f39a1c274b43e59bb6a73e646fd
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild b/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild
new file mode 100644
index 000000000000..9111334c0c95
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	tests/test_generic.py::test_issue_997
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_single_quote_op
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_reader.py::test_xfa_non_empty
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_compress
+	tests/test_workflows.py::test_extract_text
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_workflows.py::test_get_fields
+	tests/test_workflows.py::test_get_metadata
+	tests/test_workflows.py::test_merge
+	tests/test_workflows.py::test_merge_with_warning
+	tests/test_workflows.py::test_overlay
+	tests/test_workflows.py::test_scale_rectangle_indirect_object
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_subject
+	tests/test_xmp.py::test_issue585
+	tests/test_xmp.py::test_xmpmm
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index b9f7765296d5..33d4a527d7c2 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -3,8 +3,10 @@ DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb4
 DIST aesara-rel-2.7.0.gh.tar.gz 7854953 BLAKE2B 0daee9dcad9c39d1eddd469930cb540369f9463f947d706691fe1552b8e39340743aa8d8a809fe8b7943bba253ef1b93018738ca13be7147114ab6cf77a3ee37 SHA512 b03a182f366624b496bee46b86d43c68b94d840503317af74113bd5b1c6fefc31e4e4d96d6c5dd129212904729127da949cebf05c5a162711d3872e1747c93a8
 DIST aesara-rel-2.7.1.gh.tar.gz 7857341 BLAKE2B edc31030810ec4193901d258c8666080219befccca17bc6165968f959bd57661f92de86720561ab54266906e2be1a83e0fef3e81a62c2810f0b78cda1dbc5265 SHA512 85a4b24a5f58cbb95db448d01140ff64f9ea39242b204a49ddbb2ff8827a16d0ba454764ed3ce9d2b6ed58a7494c452cda39582ae89691d44d8f91ec43e1f50d
 DIST aesara-rel-2.7.3.gh.tar.gz 7918433 BLAKE2B 5f0eaa5cb241db3fb59bfd5fda0566811cb72e5dc902e15aaa269aa5fea35be1c5c51ef7515a386aa9cb20f769ad793a005e85e9b14d10b8be046788842ee496 SHA512 ffd1a830b69196537c62b21d6307f6d0f0a93f0a23fb0bacbf17934d2e5a454a93d72d33d0e28eec6b49e917770df5fc43134453e0bf1bd8433ee52ce22935be
+DIST aesara-rel-2.7.5.gh.tar.gz 7920343 BLAKE2B 04f7c1cf587799b915a54067a98608cee49de8ab8a50c6d8434aa7ad6bd27b547f9e4a4f71d459d8fca9805f97232a9ba4a1beb5240a8e89dd19f807da2b2957 SHA512 c68dc6e2893d2749d6ec3a74b850979f0766ac65c34bf07af3c0f1a16874e44f5102e1d036a88a7a43f51a44d3fffd65babf67373982362b034a2410124d4aad
 EBUILD aesara-2.6.6.ebuild 2596 BLAKE2B 8559deaccfe85f53d5889c98a2eac4d43c94862e1c24e13a3470057d6c4737f906e7b0351bc0cc2d8c61bbd1210d655dcf2c9c51cf2c8eb4a06f6aa2ca4cbdfc SHA512 37f6ea5bf1920441f3780dcb85129f73c3954413ca87929d6cda3c5d0bd928748f3143649ddee08dda109fe418c2ff0b6cf8ef55bd69f2569a44000770624225
 EBUILD aesara-2.7.0.ebuild 2601 BLAKE2B 004be043e44f1ae16fe8c502114ac47f7e5e818c1a705b8b0a0198fda0ad367ecba4a57aed86bd20b870d52e8d44ec69afb5f7e36f72342d77bc98aed53bd29e SHA512 7bc13b8cf04c7bda7feb91632a3b4126765d2c0b3fa750c69248cc4d4597cfee1753d9425d6c6044facb090e5f46030026a3735f6361871bda1655d806b06ef0
 EBUILD aesara-2.7.1.ebuild 2581 BLAKE2B 4f17dcfeda1e40e614b1df46fccea04e6342620b95624e8252e133cd9b777add9e915e9b1b37814f06967f70119c2da572b37b0f11caa3cefb4aae253bbddebe SHA512 869ce185fba22ccce6ead914f9246cc286c1a146fe3b74ea6b87521bcdc7dac90541d041f3d4f832fd1e9d301bf48bd563ceb8ee1283984aa3c88ff857e03b74
-EBUILD aesara-2.7.3.ebuild 2619 BLAKE2B 02da2de77c42a74b30e752dfede9e87ca023c5efa34f0088e6ba1b680addc342987a0a47be372ff9eab456074a4aeb0c509971ef12cc8c8701e8c5ac089a3bf9 SHA512 2e2caec60b3af8812367f7ab1538fd6ebdcb4e42d4492cf7e8128a840425203a4a9d3aa8c54f0b7fdae53394f3a7152d0b891edd645f88f64224c5e815691935
+EBUILD aesara-2.7.3.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
+EBUILD aesara-2.7.5.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.7.3.ebuild b/dev-python/aesara/aesara-2.7.3.ebuild
index 8a38a83b79a5..5dfa54ec6053 100644
--- a/dev-python/aesara/aesara-2.7.3.ebuild
+++ b/dev-python/aesara/aesara-2.7.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/logical-unification[${PYTHON_USEDEP}]
 	dev-python/minikanren[${PYTHON_USEDEP}]
 	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.7.5.ebuild b/dev-python/aesara/aesara-2.7.5.ebuild
new file mode 100644
index 000000000000..5dfa54ec6053
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+		# ..or jax
+		tests/link/test_jax.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index b7307c378313..b28e0747a7c4 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,6 @@
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
 DIST ansi2html-1.8.0.tar.gz 44146 BLAKE2B 66672927a64ad38dce0b0819fabc3778f6aba82d176e992630a8db076988a21af8dd445306b8bb580f1539b35044b95de749d6bfb65c27f9b431e4cb6bd562c7 SHA512 cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4
 EBUILD ansi2html-1.7.0.ebuild 1225 BLAKE2B 22da4cbc4407e2f8921fbc4ccf1f28c3e33e441dd129acad36000417b0f1088bb608a73c9a20123e833ba24acf21919b7f7605d682ff78e31359efdc1233bbbf SHA512 b428dc5cd02c81b8002f951becc68192320ad9c8adca1d77e8f0d9af5ec3899f9741b0d600ca3f793fde48a407a904c6b259cff4bf21d70823658b855001773e
+EBUILD ansi2html-1.8.0-r1.ebuild 745 BLAKE2B cbdc9158d87f858d8bd471afcce71351575f0a27fbce6b6ba95c1749f38da7ac356f3a929ba9850b7ab890966daceab92288a0dc8e3f726e583d9af50e1aac75 SHA512 8b1b1db98380efac7944a87af2e89438d64ed620f1447cb0bcb5162de3f68755522d387ca4a762c28dd57339b63f2ca8c25ccebd05c43ff4563aa18a28e98b3b
 EBUILD ansi2html-1.8.0.ebuild 956 BLAKE2B 6ef8144a9e0f8854e78553e67ebad97ac12ca9569ad6215bd1372704cff15c69c86b712f97eff7096815f16bd73db9b351b95cb63aa73bee4c70009aaf2b86b2 SHA512 c75224640c51ae057cf0d53480645cee9c9ecc84d686f2c1f208dda3a59ad19d29914214026225414f0a9acfeb088c5298bd9b0ac3f4e6fc9f778be923f53a20
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..f4df310fdf7f
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	doman man/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 42b73d327cc2..a6b39d1cb653 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 DIST astroid-2.11.5.tar.gz 414503 BLAKE2B 3bdd93c8c958dc8ede9b5c4b0d01399578c1c8824c511aa6697e6653ef6caec2e2597a862e03a72fc0dc6d0bc63d327a0cf4b62b9632604e9b8485f84512b5b2 SHA512 6b6d1e35b95c68d7219534ceda6e2802cc6f2d9cd9bed6a880eaf0937dfb288d9fb58dac9be33072f4676a568f778eb26a78f447d4a44842a98d8677e151e1bb
 DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
+DIST astroid-2.12.0.gh.tar.gz 429498 BLAKE2B 4daf36a96c1f47446558ef223210becd78db1ee8dc76247f9e8d4c16622f777cd9f5d70ed863de9f893b9427b479057f72f24c4c8c7b1468c566eda85ee829b0 SHA512 3a5a104a98268f61bf852f7565ef7a4f3d6ded4e8cfa0a6d5dea08e045d3fc0067633618311d82fc2f330e56ffd11d02a81c2493222eeffadf2d333b24b5aa58
 EBUILD astroid-2.11.5.ebuild 1783 BLAKE2B a1006a85d74f9412adcb9f57ab080b616e8e4dd33968c8c9aa0f4fc0402970eb2b21c1111f96302b41fa506357154e4c759429de4595d2547827f8874b7d477a SHA512 c5864ee70ddb96a53101bd4e759c1f5c3865be6c1c1d64fdd3c9d2959b5b6269b43d905c67359aeb0dc534ad22ef6556648af0ba93ca8c497abd014f56d846c7
 EBUILD astroid-2.11.6.ebuild 1794 BLAKE2B 79d94a97b10cc1410cbe8da6ca6b44f484fefb712a630bd7dde7d52f7c25cb4247d3e60594d605ec4844dbe210acbb59b19fefef51bc5b6609fbb0fcd3a8e2c2 SHA512 1273a20a8750416d73a5294131967c24c85ea0f2f017da9b0f07f712c311e82c74d8b65f9de65325f0cfbe84ae2364985a751b8dd72de51072b8ea2dd12d1ef3
+EBUILD astroid-2.12.0.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.0.ebuild b/dev-python/astroid/astroid-2.12.0.ebuild
new file mode 100644
index 000000000000..de2148b20e43
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index a007d1509792..2f82dbc57ab5 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,5 @@
 DIST autobahn-22.5.1.tar.gz 435571 BLAKE2B 5e596102b639228d95cea027a0e7187adc4f0910afbd3c5753c0408e070a37b911362eba64c79ce6201000e59381de0941619bef152ca2d784a2c19f1a67a36f SHA512 c27c0f1a782c53df7c152c8043a8e5502f19944e9d5a6ab4a95d02016dfbba70a770f1f4969b75995beed852191bde288d80d1336d56fba1eea190d6590ca642
+DIST autobahn-22.6.1.tar.gz 467355 BLAKE2B 54015ee50fa45f23fa589927da232b3ea523efae291b56b44704b66d171075d9459f1c3cf6b96b34fec119deddd2731ebd0695d49345a724bc84b57d7494f332 SHA512 b99f9e4508650fe9484e680b0cd9a0023935445b26ea42fce7565152a5692fc0d1c80f9854b4b3b3004ea17f60d13663477a8710e977211509a14dfad973c635
 EBUILD autobahn-22.5.1-r1.ebuild 3681 BLAKE2B b243c031a8db9bbb87b668ea39f2b3f674d05c054590889d5b7b2f7309b124762e59d278e2eb3e40517344995bd7f8892dcf6fc3bafc5a5cfb80e621ecb32e15 SHA512 c779c1d38e54f125739b178ce06278b98735ecee1dfecdbd98c21f0cb2c1eddb58e6f05a62aca166f1d43c26df5f52ed3bba55c4a027813dfe1aaba3fcbe7ba8
+EBUILD autobahn-22.6.1.ebuild 3685 BLAKE2B 38a2c5e862d2d284444ca0e7483914cd7dda97303580fc85c65e2c3f99596baa5208db8480f199681e02be6cebdd2d21f79369d3af9b5a61126a25b936b3a9e2 SHA512 8c729eb36a389c05c262181e6b2e49a43cbe7873172155a60cfd994ef13e9554c185095529bd8edda6cbfddba140686be7aebec7d7825f03eeb1c3f80ff9d262
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.6.1.ebuild b/dev-python/autobahn/autobahn-22.6.1.ebuild
new file mode 100644
index 000000000000..1d5606fe61ec
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.6.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf autobahn || die
+
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 4f3c14950356..ae5680fa03de 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,3 +1,5 @@
 DIST bibtexparser-1.2.0.gh.tar.gz 88600 BLAKE2B f02fca0330f035b3d9051c04ab5da57232178c637d250839c3939780424d2be9afa619d7a7781cbc92917da12aeb5f35847a54f460823b46a2a717f4b0ca6f8e SHA512 c8775f17d963c6dc5cf3f9dda52c798b70c939cf4c7a90501194561abd7f2386d6681cc236615366a9d8917ad01238fc2e6a4299f98b50b594c74c99bdb3ecee
+DIST bibtexparser-1.3.0.gh.tar.gz 90408 BLAKE2B 64460dfeea6d2ab53faba99bc0dab261e63f63fed8a4bbcf87a6fd2f4e11c35f8f3606f0bbc4d9ab99f70a1e1d6bd1f85440f730fe787a7aadd36f79c004034f SHA512 0a62d3181e2f5c1eb097f1799b871749de4ae73f09d06e40937909f2aa53d1d1e3bc1b1061e14caa048a4fb95e69ae989c94427952d759336686606831c7ca09
 EBUILD bibtexparser-1.2.0-r2.ebuild 906 BLAKE2B adedf9b1fce5b4f76b39c72e877ca75773e744a5fcc2e19dba72f25c51273421c53eaacd7094370c0d2462f47d3b1df6d95c3fa89ee07cab88a8ef62f8fadb8c SHA512 96582a7d9b69afc1677fde89d80443490c677034dfcd559b6c580be777dc71012aa2894b2342d7e3be973591053bce935362313569730d5b2df75effd51dae28
+EBUILD bibtexparser-1.3.0.ebuild 634 BLAKE2B 429b14d5b48f921099824ef3cf1c50f467a0784448419bdc127df4e09784f735861222b712eb359a03e0dd197bc9ecf15a30bae6f4bb11aae3c8edda2fd2abf0 SHA512 b7af20a04356143b60914d92f0121520206512f28459a16deda4ebed37895e536d1604351f106712d3931af398c4fc529f0e0cc55d45b75ad879fb8b379c397e
 MISC metadata.xml 420 BLAKE2B 931e6f1915be7d1b809bd2f59fec9f057fe3f6c6219ae3d5d8103a5e5155d13dc6decfbb5865d7a333247178371adae7f2712d12f0e001badb941d5fb2b8e6e7 SHA512 254ba66a5078b040ff86a77ae890c70f4d49374f2094b67c5046a8acc308901048fe8c46d1eb8d9716f13c0ac6a6c48625aa799837a1c586b2ce450a50704d33
diff --git a/dev-python/bibtexparser/bibtexparser-1.3.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.3.0.ebuild
new file mode 100644
index 000000000000..107c6d6df9f2
--- /dev/null
+++ b/dev-python/bibtexparser/bibtexparser-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A BibTeX parser written in Python"
+HOMEPAGE="
+	https://github.com/sciunto-org/python-bibtexparser/
+	https://pypi.org/project/bibtexparser/
+"
+SRC_URI="
+	https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="|| ( BSD LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9ee184ac8fb8..c3b3089759a6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,8 @@
-DIST boto3-1.24.12.gh.tar.gz 509573 BLAKE2B 5c9978cac1cbce0521dee6f2164652c4fca82b0bf20276e3f4e75960e0877ec0545ca50884daedde115bba117bea424da2ad2fe63e845a32a6f832a3ab5a5841 SHA512 dec940a6e97c51089933a66994b14882f31f2ed7959f966e1f9cd2e6a4a1bb40cc2c01d509ce7346ac345df30d0f164213034c0de97daf3053ba4ea51e5f7495
 DIST boto3-1.24.17.gh.tar.gz 511281 BLAKE2B 577efc0ebfb39957e55bcaf7aa678cdf072eed885ab1055b15fc8ca2295fedd6d56fd2fb919913beedcdd335ff26e452bc5434283c9ca9d8f0135080e2aa1312 SHA512 a843146951eb2a5ad7dd31159d833806ae403014abf3e9a617f6457e3ecec1a0dc4c6ce6a87079c9112513cbd6a2ccd26542e5736eeea6c5723c7e39c660befa
-DIST boto3-1.24.20.gh.tar.gz 512415 BLAKE2B c2196a9a518b0e4c0fb6e2382390d7d8e275d834a363856c266f696d57b5d56bf7f6a07df10d44670189098b19e0fcfad2a4907af10cd0d6361a5b2164bd6269 SHA512 cb4e426654895e26867a165304d03a722465441e10bf4dfd76fd7c5b45289785ba83f4f66c45d256a5ef6beb3cf5dfa923ea7479e99361344288ad98350a68a6
-DIST boto3-1.24.21.gh.tar.gz 513083 BLAKE2B 1de0405823b6b33efcb11316a3c400180fa3f9064a63023e2f13d6ae18fb6e60ac229ba11c8eb93901d4a6ca65aa32e9ff576b421ffbb6e75476149e93df4d2e SHA512 4f278cbe0bffd2107354aaa76ef7e725a8ea3fcf1688614203204b495be596405fcb0add790922ab09858d94798bc06076c9160f42ff20b855b8a31859c57bc4
 DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e941562c256c2769941340f6a9e3342394f9e2cf20d658bc4b0e9f5ddaebc832ae8fdc96e35e348b73631ca01f0be33a6 SHA512 eb64a050c1b63da823fad2b10db828fefbf75a95ae1f222576eabb8efa80cbbb3e54862dfd40813a8d58f9c329f4d95595bbebc172bcf0141c241499af7d4726
-DIST boto3-1.24.23.gh.tar.gz 514077 BLAKE2B ff5b661d477e8163e83cb85045b61fa8057f9cab0b93b2d4575904b17361801e3ffc928ee86624bdf61213a0dc93be91f101e30f418869a1c5dd65e16ff9ed2a SHA512 c127f11e7cd42d0c7f2b802de425d087722ae81fc642fd6867d44cf1b1686ca94b3de76b3034abbd9b85393f8f59d18ea46cd68a57804e658d65e9fba6e6f9a6
-DIST boto3-1.24.24.gh.tar.gz 514350 BLAKE2B 6ddb182ef3fa9018d763747bcc3508bbb37a40576ac80f4fbbd25efaa2a96de411a76a2cfafdea7664926c07f7733245b2a6703d8c2d341e43450e7d7eaa4894 SHA512 2465c33529900a7d67f8cc994a0665879d940967279d33be167dcf2eed078575ddea099a40978b291c7a941e8276f3938bd52a002634e73fe64272d8843e47d2
-DIST boto3-1.24.25.gh.tar.gz 515150 BLAKE2B 7a6d1bbe4aa327ad9807305b82ae4de5e7035d5ca65203a4f57811c5178e9ea3dd5253a20d566bc7a3e641a8eca709f9fa39f9d53b17a9a5b85ee4a50d090bbb SHA512 13ef720324abbe710f52811490ac7f96ebfe2137ed02fe80bbcefe7514c01316c4338da1690f84b03eb1e5aaa44f74ffa56292f053a04a813d5afb27cb072a32
-EBUILD boto3-1.24.12.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.17.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.20.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.21.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
+EBUILD boto3-1.24.17.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.22.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.23.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.24.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.25.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.26.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.12.ebuild b/dev-python/boto3/boto3-1.24.12.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.24.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.17.ebuild b/dev-python/boto3/boto3-1.24.17.ebuild
index 6edcc751d54b..c93eb5e2d7c0 100644
--- a/dev-python/boto3/boto3-1.24.17.ebuild
+++ b/dev-python/boto3/boto3-1.24.17.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.24.21.ebuild b/dev-python/boto3/boto3-1.24.21.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.21.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.23.ebuild b/dev-python/boto3/boto3-1.24.23.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.24.ebuild b/dev-python/boto3/boto3-1.24.24.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.24.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.25.ebuild b/dev-python/boto3/boto3-1.24.25.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.25.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.20.ebuild b/dev-python/boto3/boto3-1.24.26.ebuild
similarity index 100%
rename from dev-python/boto3/boto3-1.24.20.ebuild
rename to dev-python/boto3/boto3-1.24.26.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 93af1b889b16..23ff107035ad 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,18 +1,8 @@
-DIST botocore-1.27.12.tar.gz 9132872 BLAKE2B 74b74b5a5745cfacac066d5e087974fb58be5a600c7cfb2077d243044b8c429b1396d19e6790c0f754e42931085b115f74039b8c93da39593512d28021d6314a SHA512 767defae44ffb3b54b55625fd0f8a20c22a4a5f209a1397b1a27cfc2e36ac9e03cfdd25bc77bebc944613c5744dd7651e1b574674e8a992f219e172eee9210f5
 DIST botocore-1.27.17.tar.gz 9130505 BLAKE2B 04c6b37f3b42a0f9fb696b5213338b004418a68c754f5027ad447119fb20556dc49bd53f40fd9560ea3f5bdcf2afbe151dba68e901079baec770f9f223b1a894 SHA512 b1a145d3c97adfd4df40639da99e1c34087508be189d5818ee7176f20454f2897a6f518a14b4bfbf41cb169a17188bec467337c10d0ad511e223f0c1ff5b64ee
-DIST botocore-1.27.20.tar.gz 9146126 BLAKE2B 3ec9e6480fb5bc95f72ffa1f0972b7d9e807fce2e69a3118818a7eba5c1023316c9499bdcbc2f6b2616842eb8797ed0b2bef5ebceee5b74a12074b927b339994 SHA512 1ac0b189e14fb25f07c63e4933113ca64c2bdc53fe719270daccc55b2c7d8ba7421fa81aa60e6fc3a0c86cdb3f57980781388586ce154d87f17f860cc943467a
-DIST botocore-1.27.21.tar.gz 9149425 BLAKE2B fa7141f78128ebc4810bf51bcca93a23606ef611721fd1a32ca490a9e38aef86439385bd7a0465e82a853c5bb7596dffb0b17fc5d7015fb5039f4933ab1554f1 SHA512 59bdf83b237e3845f48685919a6330846d2a4d7ce12d15d99cdb8dd9f2d3e0dcc0d1641c52de8d6d9ef7b7202b80bc59070cb1786f1b38c20884e0fa32481432
 DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af71654021b28f13c43b4005ba24a32cfccffa9a145babb781a6cbff9df3eab7de4c18973c00b3861ba83264eb144537 SHA512 57e43577840c62556760ff40d820898b0ee1efeb5da39fbdfe8c7ef53e86c8184bdfed5a52eeb9d0652fa053900462bdad9820b4a34bd4b5231f361b89c710d6
-DIST botocore-1.27.23.tar.gz 9161058 BLAKE2B c4e70d4662b45b1365eb3db3f9aa39ef989bb95d962c4b31fecf16b2bc5b14db46cb5aedc7abe23e2fd6484544efa2a894141c1245c842d9c05a89cb560ad0a2 SHA512 80c70c50d5a8fa5f9bdfa5cf0762edd83c8503bf1a65db1b8680e0d9ed8356699ee23ed4db0ab60e34b69cdc5ddc12ff69f2cf3907cf8f8d5075d26a3ba4373f
-DIST botocore-1.27.24.tar.gz 9164664 BLAKE2B 3a1453e01dec7b526ac613f5a0b98151e8cc60d524e0dc11d1b1ab82ebd16bdd134190618a4469d44a14a18fe26027a51f04b351e35399ba8f1d81f82ab9a780 SHA512 5778d031e11cf3e441b844c530c0685c1a4fdb5a55f8a45b77c62028cb49852eea4f1dab09af2016a5cfcbab7dcf83cee3143f517034b03d1379be2b85e64585
-DIST botocore-1.27.25.tar.gz 9166544 BLAKE2B 276f50dd87aa812cb503be3c0da67affaa664f7deb3dcffc34056d72982840db0b026c16e7d6c0d01aa77adbf649893b69ef8d5bbc7d4dd55fdba43f2cc5ca2b SHA512 833de71bcea3ccf85332530fa82f5b0713eae58bfa132a06d8f8b51315bfcdbac0a9a271d2408fc99751edf9ddb7370d331cd93475d8daf1d938902b8fce59e5
-EBUILD botocore-1.27.12.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
-EBUILD botocore-1.27.17.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.20.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.21.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
+EBUILD botocore-1.27.17.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.22.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.23.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.24.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.25.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.26.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-9999.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.12.ebuild b/dev-python/botocore/botocore-1.27.12.ebuild
deleted file mode 100644
index 7cd0e672f49a..000000000000
--- a/dev-python/botocore/botocore-1.27.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.17.ebuild b/dev-python/botocore/botocore-1.27.17.ebuild
index 830c713f6036..7cd0e672f49a 100644
--- a/dev-python/botocore/botocore-1.27.17.ebuild
+++ b/dev-python/botocore/botocore-1.27.17.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.27.21.ebuild b/dev-python/botocore/botocore-1.27.21.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.21.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.23.ebuild b/dev-python/botocore/botocore-1.27.23.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.23.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.24.ebuild b/dev-python/botocore/botocore-1.27.24.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.24.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.25.ebuild b/dev-python/botocore/botocore-1.27.25.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.25.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.20.ebuild b/dev-python/botocore/botocore-1.27.26.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.27.20.ebuild
rename to dev-python/botocore/botocore-1.27.26.ebuild
diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest
new file mode 100644
index 000000000000..3358c48053fc
--- /dev/null
+++ b/dev-python/canonicaljson/Manifest
@@ -0,0 +1,3 @@
+DIST canonicaljson-1.6.2.gh.tar.gz 10311 BLAKE2B 7460b99d8e95b223e4d092ee4158c13b5b101d7001fe111fed021c15128d040ef657ee03dbfba14d2e3df0a61f82a072e171a87312f47f524baad1603c6e47bb SHA512 5dfcf76e80814e65b897e216e18cbe69b3f44e7676fe433cefdcfa15dc18a004dc7586c16bf95b7457cb8e9268dedf2e7b1b92247b7c65afef30888b1c89bde5
+EBUILD canonicaljson-1.6.2.ebuild 597 BLAKE2B 53d255b15757dd6f0bd0cd4220f48b15d712eb91f2b62ebf1801a00071e12611cfcf0e1e7369874a08dd548b496aa79bc93f9b09acd05dd820e3105d5a84972f SHA512 53e99ad5b9f1bbe21908a7ba9c1c1fa0fdad3419562c77a3d191cf4882052f854a6a14cb629c097309889d52503c84d43a662dec716ff0a26e2c743ba48f6487
+MISC metadata.xml 538 BLAKE2B e186cee6c15f1ba766ff31465eb9fd72c8d05aefa9469d103423d36bf14241729cd8c8828b3a40f4b0d9192b97097009b7deaf27b835f85f67d3c1b24bb69784 SHA512 9386852e368e87bc9e8e6aef01f0de54de43e03f2e674ed2d4d2e982ea371ae90828ffa4f7fe664d6db1ed21dabb6f5b5ca44decad90c968227c178404903cd6
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
new file mode 100644
index 000000000000..6b5049ff9f14
--- /dev/null
+++ b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical JSON"
+HOMEPAGE="
+	https://github.com/matrix-org/python-canonicaljson
+	https://pypi.python.org/pypi/canonicaljson
+"
+SRC_URI="https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/python-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/canonicaljson/metadata.xml b/dev-python/canonicaljson/metadata.xml
new file mode 100644
index 000000000000..fdc79ac629ce
--- /dev/null
+++ b/dev-python/canonicaljson/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">canonicaljson</remote-id>
+		<remote-id type="github">matrix-org/python-canonicaljson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 0877b42d4878..ee5dc2ec5f79 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,5 @@
 DIST cfn-lint-0.61.1.gh.tar.gz 9351410 BLAKE2B 442fa5957f8816dc501e91593873c28b1b2e39ec14870b82574d4ca351f321b94a813fd351cc09c7602a177a8451d09cf8459c8aa47b683b9938654c99476e19 SHA512 63071cd1df0115624341fb64bd12a51d7bd38fe4993229a790ca09011b370487cb49397d90916f4df42b5c978cd3832e2de4cec15660ac8668e994adc0e681c3
+DIST cfn-lint-0.61.2.gh.tar.gz 9477584 BLAKE2B 8b65151edcd9323dd44d6a77c39fb3dd90a1934bc1cf3e6cb419e6a33595afeb740591a77a80178cbaa5dadd5183759064807a5a135545c2fb7e8c5a2c8970ba SHA512 ed8e9813f1d12ec0ded203c4c2246592c2aa3466f69ee2a478d9ac579807a610836d862768c259ebec6e421bbe92a5a120c056a5e4b70873e6e044e0c606d021
 EBUILD cfn-lint-0.61.1.ebuild 1638 BLAKE2B 890ffa9d97980c5fcd532b44c93c9ce851c0ba38214f7ed6ecf3e68a64c1a14adde34594d9a111987a6740fc06dc30d533e9bdfb46f5bbecb6d6563991975b13 SHA512 a298830dc9249612b174d764b201c5e3c65504ae86a40a81453c13ffff12de4d5e79e7110edeb3645a403f94f781fb53e7e850796199d71a386ca99cc2bf0026
+EBUILD cfn-lint-0.61.2.ebuild 1640 BLAKE2B 1c8eb1a6a2321d09f163cffb42d2af24ea43571504519d9fb0c28063d2f5e2d7e8da4b38f814fd348a7cc2a317ddddfab7429376b852febddbfa9ff6c52bff2a SHA512 e13621a54e1eeec34bbf2d9997177d6c0af4a7917c13e13d36d32cc1b07e919012faa58e9599c585e25992fbeb11cc5f7aec85e20d0f54c69d647dc093ce38f2
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.61.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.2.ebuild
new file mode 100644
index 000000000000..8ec456de9b4f
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.45.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index cbd046f34ac5..85a3b905d109 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -11,9 +11,11 @@ DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography-37.0.2.tar.gz 585433 BLAKE2B fe70543d53b1cf5d6986a9d8f18394c1a32bbeb19e39bc9ce185cfb1f21a78a94beb228a078d7d74aa070d5899705a5a0dbf4b4b46ab6f43a4cece1bb6647ddc SHA512 28d8b52ca457dec0c854ffb798c9ecb4316c3f161ece5c304c7a5e0cdc86e8b567f1cea82f96f23b01af611e04f48fa310c0e78b3175f4b06e9175acc6a2de45
 DIST cryptography-37.0.3.tar.gz 585915 BLAKE2B a323ea941f34b6008604770d9a9a23acd78665dc6877e2e60087abf3d1495c0bb7fe8ac7d11d55c64006be62b27859ed0dbd4e1ac43f7784f8b187a91d708516 SHA512 ce5aefd6b855c32b75b566ffdcd38e6ba264f897e11edea865010e7d9f5fa72e517e042416109ab36e8558b5c4340e68b5ed654ec9485a5ab7f7fc11262e40d0
+DIST cryptography-37.0.4.tar.gz 585913 BLAKE2B 3ed76d5cec1dd75ab89e9cae1357eda82b23017406cd84d97ab70d6b598cb3c453e34ea013d35b5a482f032b8513c0245d4273c2201313f42be54e404fa2b598 SHA512 9d39a2ec4facffd6d1c1db9267248846071aca8ac3bccba3da2d1a0664c6ce2a38c5245a9b8f62845a83abe6ba2782c43333aa4260960f37dc2eac3789a73575
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
 DIST cryptography_vectors-37.0.2.tar.gz 35240459 BLAKE2B d490cb95b4f32c508867fda059ddbdb5c1bbf46cad709f0e66148cdb5934fbbadd3078f361f4b5bf2e1e30b277252e3df7337fcd4e4694cd9e878c0b70fd71e0 SHA512 320a4c13f076d6d7bef0437b8b57a76496c51d0266c9958aaeadf73e9d07510e1219f3fa08aee1b30cb6122daf4c0b85538c5be95f1dbd450bacb8cbe464892b
 DIST cryptography_vectors-37.0.3.tar.gz 35242917 BLAKE2B 4eeaa7a3da89e950bc5547beae25d45760578b08246b8cf355a86649650abf23ddcbb0b7b6ac98ee6519044fa4a0cc027b612cc9853362e91b051e4b5ac2fefe SHA512 fc9cca105656fa1088b07379bd7c50af7c707ee13e25cf26c3d58f6c9aa571c7c14e676a237943fe98b47d7f398bc7ddfb8a0289b1dfc523a858f9b2ead796ee
+DIST cryptography_vectors-37.0.4.tar.gz 35242881 BLAKE2B 3b58f12deec978e0d104ee84d2330248fd00291b63ca181a1e4803253e643496ee3cee14ecf84681db60da028543ca50d05968cac4d2c0609ae820b3a02463dd SHA512 33098be46d072bf35f72320d64fd244a8ef890e99ae7baa21f9fbbb8d423d60f2711c3c1293830c860ff9bdd79bff910ce4df0f4dc9f363d712b722dab2de7ab
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -53,4 +55,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 EBUILD cryptography-3.4.7-r3.ebuild 2165 BLAKE2B 62aded5c10bc74dd3b9b231cf8d704a361783c113136d117b65193f2d9433d9b6365f84ffd87956919f52000df2fbea7efc7045ef8a467c68b913220d85bf81e SHA512 37d56d46f97b6ff2dd4b30faef32fca1205851555fdee643f2367364591228a7c329aed4e9ac9d077be3b8de93a70651e5fc59a6f566dcadd4427535e9a183f1
 EBUILD cryptography-37.0.2-r1.ebuild 2944 BLAKE2B 9d1342b9bc50e963cfcbdc1d2212b80d7a778c408b0614e49cb417161ef3c5fb9c7e0fd452d47f4f1835ec4c6cd3759799992c812db90dc79021ca65c796c5f5 SHA512 8ab91ceff0dd803379be6f0623cb63dd33b7fe4c147b68c78f716ddacdfc58a4171d5351225dd2199915393ff336e4f2c8afa4779451ca668044ad54d68860b4
 EBUILD cryptography-37.0.3.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
+EBUILD cryptography-37.0.4.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-37.0.4.ebuild b/dev-python/cryptography/cryptography-37.0.4.ebuild
new file mode 100644
index 000000000000..0a6fca388dd7
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector-0.11.4
+	aliasable-0.1.3
+	asn1-0.8.7
+	asn1_derive-0.8.7
+	autocfg-1.1.0
+	base64-0.13.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	chrono-0.4.19
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.12
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.10.0
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-impl-0.1.18
+	pem-1.0.2
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.37
+	pyo3-0.15.2
+	pyo3-build-config-0.15.2
+	pyo3-macros-0.15.2
+	pyo3-macros-backend-0.15.2
+	quote-1.0.18
+	redox_syscall-0.2.13
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	syn-1.0.91
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	version_check-0.9.4
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? (
+		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+	)
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 53007854e680..1acb38b4596e 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2022.05.2.gh.tar.gz 8721528 BLAKE2B 42b83ca6fe58b014d3aa90cc99dc4b9b631d6b5bb3243a2a2bd1bcfc6f9ffe5d545b7bcc43edfd3299273e105f7355fbaa9490043a12a8c303773d0e08e63d8c SHA512 1d6ce8db1c83ac22f081beec8667f35acda48578263c637ee294934c729d16a7aca4259e0dde6fed6f2dc9924490589610fc3fc4225dfe07552b15b6af20d8d5
 DIST dask-2022.6.0.gh.tar.gz 8727952 BLAKE2B 060595de52ec64db83bf56d5b4c975ac22009fbe4efadd903ddafa80400e8b5706d60a47445b70f513a73cc915dc696b7ee17831f6c4aed4f55ca11bd8c4fcce SHA512 92619558dc8ed4808842cf45bad703443bfc38f2206fe15e65e5dc457040042eeefc9cd0fb16a8322c4a8972dd10b0b7250451d1883a148e2238f5bcb3f0555e
 DIST dask-2022.6.1.gh.tar.gz 8729249 BLAKE2B 211beeb3960569aa1cb68a4fd9b261a417297de5dc406d50bc54342239227ea01e2158b618bd889862a7eff8bb01bb43d098937bb3911f088250957caa672d04 SHA512 6e06b63dd5c7f1d7c6c7dce867ffa42b956023b313b25245a339f698b06bea17a03cc4ead9bd5aef8ddf081750cad4df4b6b2972038315c89585221382c9e95c
+DIST dask-2022.7.0.gh.tar.gz 8748843 BLAKE2B ae0e63c883e6542aefd29a619168b1e86e9b20d43e7966ecb8a92a90b72952acd7e08ce53fdbc146b47bcb7f65190f2d0cbe19966c52f94b0d52eb63e53778d9 SHA512 11fe292134dac14e30068b98d88e622af2941b7fffa2c667b39b87e4d28ac6388001e18a8628bd22bbd48a2a10ee707dc25618a960a401e40cb73b2231fd2dfc
 EBUILD dask-2022.05.2.ebuild 1525 BLAKE2B e3a0a84144604df9d5a12ecfb37026b255e588c1b3a22d668338074f0af832ad66043aafd77576a962f69249624d318ea8372a0cfec55ed342bbd7a3651bed6f SHA512 546b309ee34fbdcd72eec139df6be0d87fd98a99f70e8a12dbebeeef844bf81084e3d38889f1f0109c20ad473ec785f42b6d5eb22f2f38b4080f98554092cc6d
 EBUILD dask-2022.6.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
 EBUILD dask-2022.6.1.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
+EBUILD dask-2022.7.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.7.0.ebuild b/dev-python/dask/dask-2022.7.0.ebuild
new file mode 100644
index 000000000000..ce906c8679d6
--- /dev/null
+++ b/dev-python/dask/dask-2022.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index a5f5fc85e1c1..a57b6d19978f 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,3 +1,7 @@
+DIST docutils-glep-1.3.gh.tar.gz 6719 BLAKE2B 55d0ac9632d3f3c65f149f444ccdbb24cb4aaad42766f2ef94c11877e3994301630fe2d3f7f3229ddcdb3950c28f2e095af7d0a6563329f588e732c196e7c430 SHA512 20d0fc1f97144a2566b62e40fae85b750e2c4bab50efee18f102f3d6cf7bffeb0d60a6c7e8feeb231afaeff309c4faea1c105fa26f8f4a6d140b5863abeda980
+DIST docutils-glep-1.4.gh.tar.gz 6758 BLAKE2B 92b519022df5d8ac90b7eae15a08e0f0738badcc7018d8d621f9789ddfa97a0ad3989a39b65068ebd1e5ad90b2ddcbd6c4e953de06562391b12eaefebd60dd7a SHA512 601da0d0f7c4fdb2976755c8ca57e07b55b8d87e99735378a3dd5b1b43099d0fe2bb8317265d23e61b536b907901e75a3b527e16125dfaf2ccb178452e411af3
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
 EBUILD docutils-glep-1.2.ebuild 658 BLAKE2B 11210c6707f5b9d1f863389fb9506690621ef936b9e5d76302339000cfe64d57445aba8474119c34e153c91fe5cc8e0b62bdae9e011ca3ffabc78d73bca9cb51 SHA512 b953d35d3fe58464e84a4044ec4d8fcc79a5f87e677e4a9c83443a25a13f5ad19ca3b84ea9c072b630eb3217f667728cd891360901e67fbf4d0e80b2fe9593fa
+EBUILD docutils-glep-1.3.ebuild 753 BLAKE2B 97a14b09e92cd2f4a155581f538aaf8517b7252c7337cc4acd0c116badbe86c83186d42aa5f51cbd2f53a6ff68e36714d48c781eea32b7068fbb2564d530f113 SHA512 566e256aa50f3a1ae0af798ce179a8e80957ea98c5fccc8be83d8f935a70e28bdf481a621a89dbbb1ae8405e364ed1ac4f0c8a34cac570e66d6b1b78f0aac622
+EBUILD docutils-glep-1.4.ebuild 753 BLAKE2B 97a14b09e92cd2f4a155581f538aaf8517b7252c7337cc4acd0c116badbe86c83186d42aa5f51cbd2f53a6ff68e36714d48c781eea32b7068fbb2564d530f113 SHA512 566e256aa50f3a1ae0af798ce179a8e80957ea98c5fccc8be83d8f935a70e28bdf481a621a89dbbb1ae8405e364ed1ac4f0c8a34cac570e66d6b1b78f0aac622
 MISC metadata.xml 449 BLAKE2B 581602347cbf39c4f5dff22de867ed05c41293f2dc941b74cbb147347ab6133f44e9e2e9e816024b8e7b54b25c2f6cf4ed4b6dcdef3db92205d4c209b962da0d SHA512 eae3da00c7977de815c67488270909234a2a06d48ac920b62f911d0d10a5401a55d0c153412830b4d33a42bd5d5b48ef158611d1a9d8bf3e0b9574546935ebd2
diff --git a/dev-python/docutils-glep/docutils-glep-1.3.ebuild b/dev-python/docutils-glep/docutils-glep-1.3.ebuild
new file mode 100644
index 000000000000..7901094e4045
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="
+	https://github.com/mgorny/docutils-glep/
+	https://pypi.org/project/docutils-glep/
+"
+SRC_URI="
+	https://github.com/mgorny/docutils-glep/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/docutils-glep/docutils-glep-1.4.ebuild b/dev-python/docutils-glep/docutils-glep-1.4.ebuild
new file mode 100644
index 000000000000..7901094e4045
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="
+	https://github.com/mgorny/docutils-glep/
+	https://pypi.org/project/docutils-glep/
+"
+SRC_URI="
+	https://github.com/mgorny/docutils-glep/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 20eb942aa607..f4307b763afe 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,7 +1,9 @@
 DIST dogpile.cache-1.1.5.tar.gz 392536 BLAKE2B 062392cda9b06da889f924bc04743faa133b978a908ffdbc1e9cc9a2a9a69db22ee26b27c7cb2ec2dedee20786cf90c6d02d163731224956091b2d3baa25774b SHA512 b6d453121ef8e58da60478e2e1e2db57804dfa3b17cceeace930ba75d159629dfba4b5d63c50fbbc2eafeadbfcd6e1e4cbe22c8da1f54c90473f8ee677d764f8
 DIST dogpile.cache-1.1.6.tar.gz 393076 BLAKE2B 62c16ee7cc00608432d45fa7cb068300a4417a494e4580a2af5c3f7c5a0bf40a54e1b6f4924bbd7b40a0efc1cb9afb42f361811c257fa77eabcd64cc35fbcf51 SHA512 179246abf598675cdef988b463df4997c7eed8e7a110c22704052f905b65ad537b22ba28d7c96a28b2aa85b3e83ac42beb36843dc78ad503d41225ea1f9e7e77
 DIST dogpile.cache-1.1.7.tar.gz 393572 BLAKE2B 307aa89ae7814b5703cb32bfc703152b0aa8c80c7cc5be8341ae02c39fb5b27d5b650e02597ee5e07f5994d9dc95bc344422b54d8d431d9c0ad678d64ddd398f SHA512 2c7e8dfc252241ad075a073ad1c1688865943f6e33a317618a47e95132b65ac891b00d5aa0bf3bcced005a6157b50754b086192470b3ce867461bf183947d603
+DIST dogpile.cache-1.1.8.tar.gz 394499 BLAKE2B 3371e6ffceb6629200a18095a20a313952b8a246d2ec7580e6409bde0f16851f8332922647b92383b47276933cfeb818dde6df48efd2534df0f94cbbc511e01c SHA512 2bacc111e17ecc706b3389f5c40ded888cc893f6d01c34a4e1e0d8d94c4592369b0c283aa80eb6ebec90dde7a89fd3b7fb9bbcbdd8010f90ad7de4501db13ace
 EBUILD dogpile-cache-1.1.5.ebuild 764 BLAKE2B eddcf9fc01c3942cc1292bd2dc4e5ab10abd6162a20824f4b6ddd8c6c26fe34f974750e5a6acd853fd36f039f8c70d9121cc08ac7125e45c4f43556996568e4c SHA512 029b30a4b8233841b577755fe1fd516161afc08900d2d8131ceb761e27237274ab206bd7ddaaa599bf9758fecf0641f8f1bd76fd01de2078f692be76fc92fc96
 EBUILD dogpile-cache-1.1.6.ebuild 767 BLAKE2B 8a10baf236407ea9d8adbbdd7186988b19975bf7936d5f9659979d8b08544b1afbe7e01fab23f7c11870c6379340fc82fe0108e3f841f35e3c089ceebfc7d797 SHA512 d127e8914e8ca20c90aaf4ab54a742ba91dbff71f10041d4591a447637d5186b8a02177fe6e4a5092868d9ff9f6df2d16fe473170cf564db03d1fa3d5df6be2b
 EBUILD dogpile-cache-1.1.7.ebuild 767 BLAKE2B 8a10baf236407ea9d8adbbdd7186988b19975bf7936d5f9659979d8b08544b1afbe7e01fab23f7c11870c6379340fc82fe0108e3f841f35e3c089ceebfc7d797 SHA512 d127e8914e8ca20c90aaf4ab54a742ba91dbff71f10041d4591a447637d5186b8a02177fe6e4a5092868d9ff9f6df2d16fe473170cf564db03d1fa3d5df6be2b
+EBUILD dogpile-cache-1.1.8.ebuild 765 BLAKE2B 74e7a3620be0721533785ed14f4f0fe32c74e9a653c49fd48e5cf829a15fcdaba9886ef9719aba6b86211c10fa39b487e199363bf45099dce69d7c5bebed5869 SHA512 8c4ba3f8f0a3b2701ab59492bd58306951f9ab72087e969feaa56f97f2ae5015dda333da80f2291a5cc7f92b525aea229d91bd214cb9e692a021c3e674a8f25f
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
new file mode 100644
index 000000000000..6223cbabac68
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
+HOMEPAGE="
+	https://github.com/sqlalchemy/dogpile.cache/
+	https://pypi.org/project/dogpile.cache/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 664cd9902f70..35b0d3d0b05f 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,5 @@
 DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
+DIST ecdsa-0.18.0.tar.gz 197938 BLAKE2B d4f55591d58a998e69c070983d6cc45720677f83dc6149bd95938c79391df85fe5ce8fe059e961d23b8334d9ac4ef4972bff91a6e9537affc9ddd75c7cbce4f7 SHA512 f26dbeccd8e6ec832405d419b7244ca97b43a2811513493913a4f2f2fd1d2f453068fe0ba7b90b972f42a0d7b9834212fbd4d4559475cffeb1d80075fa954d78
 EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 71ee14deaf7622086379397dd83681ddc8c6cbc86cc0192d9d13ebefeb7e2b130a307375e0a306bb0bf43491216d619c43718358b693caabdda4f2750a70500d SHA512 1cad3382bcba9be8424d0e69dbae70eeb78bb8e52d1e243eca13f725213c7cb768b1c5a470fd6cb6be0d85431d48d0e93fcb97d59f239756e16dedb4160e7670
+EBUILD ecdsa-0.18.0.ebuild 780 BLAKE2B 2c4ae2533edb77634fbb5708a6e056f16c146219e8dc62ad772b1876871815bd5bf1a7bb3ecfb8b7a8910e0c58c2069e7ac54b132c632ab80c6011b9070845e3 SHA512 b9c12539ca50ba0078ac5aea6569cc02b1db522d83c0e3c6ae2dab80782016c56fd8c3ca7a7de3f331c4652f97990bde34d7904b68befc68278a93c54ceba9d3
 MISC metadata.xml 408 BLAKE2B c3ccca8cd48352945025d466f06c143e78923085d82bc219087e1015c3e8219ff5f397739420e588a57a47136da6c4adb905d12fad8d06803b2f33688150b1fc SHA512 12f542d7bf34cf1cd3334cb076490ed04b3a484f0aed3896fd02fd049f371a46f11e078253b3f8d4a3165c8893692e4fcc496b61a9aadbaad570e7f194bee22a
diff --git a/dev-python/ecdsa/ecdsa-0.18.0.ebuild b/dev-python/ecdsa/ecdsa-0.18.0.ebuild
new file mode 100644
index 000000000000..3920d4122ee6
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.18.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="
+	https://github.com/tlsfuzzer/python-ecdsa/
+	https://pypi.org/project/ecdsa/
+"
+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 ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/frozendict/Manifest b/dev-python/frozendict/Manifest
new file mode 100644
index 000000000000..3bf7e29ffb1c
--- /dev/null
+++ b/dev-python/frozendict/Manifest
@@ -0,0 +1,3 @@
+DIST frozendict-2.3.2.gh.tar.gz 306318 BLAKE2B 3bc10f34784a8b76b7c6ca0eeccc8331e9a558f0e24d2328550eb5a985ed2ad6c94d027c51ee44f2d25af67fc453356e01b5cfee773880b87d73c55113ca10b2 SHA512 8dc88a3e7898be8fbced16fbdbdee469d07ecbb06a059512f98f71e50a8c5f2c3a4f3d4e6aa06bab121e4ae2e9cea76f6d89c73212047069f2ef88c616c7278a
+EBUILD frozendict-2.3.2.ebuild 626 BLAKE2B e7bfaa07deeb8362a984a5417ad1e1aa99c33303cef66f0bab7880050af28ec0c9557f99f2f6101ae2a6c9b4692f2bbcdc97549ad9e4fb8dee02405e9f49199b SHA512 f69afcd187675991efbe5338a76d58008a607bcd2aa7086de30f0cdbabda3ae94f1d9e5ffe7ca0c2aa798c3f9ff1a821406d5168b42350d15c3f1c33b8e4114f
+MISC metadata.xml 533 BLAKE2B ba17bdaf9d30d16cf97728129e16da896c21f8ffe938a3e068a85899a3ccfa36acb1d071ab70c4a3a28d05e082708890864f370d95beee344af1e65e0d144ae9 SHA512 62a4439f0b6d4658191118dd7ca5e9e09600b3f92af456aaddf7244d4be591d48f82ed7f479829e2efe96f55e1131b6a38302705d4f76ddec2ddef4865d9b1ea
diff --git a/dev-python/frozendict/frozendict-2.3.2.ebuild b/dev-python/frozendict/frozendict-2.3.2.ebuild
new file mode 100644
index 000000000000..28a3b265a196
--- /dev/null
+++ b/dev-python/frozendict/frozendict-2.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple immutable mapping for python"
+HOMEPAGE="
+	https://github.com/Marco-Sulla/python-frozendict
+	https://pypi.python.org/pypi/frozendict
+"
+SRC_URI="https://github.com/Marco-Sulla/python-frozendict/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/python-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# few tests fail with python3_9 and one with python3_10
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/frozendict/metadata.xml b/dev-python/frozendict/metadata.xml
new file mode 100644
index 000000000000..f556e15b09bb
--- /dev/null
+++ b/dev-python/frozendict/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">frozendict</remote-id>
+		<remote-id type="github">Marco-Sulla/python-frozendict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 791b501f6f6c..9df990eab04a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,6 +2,8 @@ DIST hypothesis-6.48.2.gh.tar.gz 9316125 BLAKE2B a35fde81976dcc874897bb14cbb65f5
 DIST hypothesis-6.48.3.gh.tar.gz 9316363 BLAKE2B 25e2e722d9c57902c62eff687959af340ebece8153b581acaee568bda965f635950fd8e2a304d687c69e57fafcb2f6ad7be69a7aad193119ac9766d659cc58ab SHA512 0bf8b2ded8567051dccb4651099ef4010dcb86b779ad2b765b0bd16e36ed7fa176f7698ec1c9cfa388f6de22c33c5c0d55b3168d43f9b940d1ba1bee3d930914
 DIST hypothesis-6.49.0.gh.tar.gz 9317131 BLAKE2B 670c35c2ad6426fb7282fab3d85a1b185e38116ca584ff1bdaf1f406a6dd900c6c5c74777269acd72fffd86b3ccc210041323041c2af0296e0cce5c86295d286 SHA512 4064215c39c3888226abcf4d16200970e8ac0841d71a8e7d1292813caed802a90b658c309257648d336e9fe8750423da91f71ce5038a7b8e128bd468984ba318
 DIST hypothesis-6.49.1.gh.tar.gz 9316607 BLAKE2B 936d6e6ae293c4648b3ced9eb0fa242a8212182a0c0f988c3c25d748ceea4eeee2074e0da8db1375c2ad32da2061141d3801d037ab370df15546363eb188783f SHA512 14b232ad1b2c233566d26eae2be1557ce543109748b5f835f74acbc9aad6aba2d75e4f9c357ee6dbc3bc75e175413058b4796d2853921c23ff083d66424cf7b4
+DIST hypothesis-6.50.0.gh.tar.gz 9317328 BLAKE2B 931e3cf8702344cae653d879fe88c6b3854d58fa646c51f655400c96cf300863a6e8858de51d1c47a236419af98a636a222a32c86ca35274ae00a452c8266c5f SHA512 b173692d5b909ed1e158711b80e35366810ecfa31c2fef79908439f3cceb56814788e013acada930243a4a4c306e53fc16151d73c5090fd0a7bcb7e029c66a0f
+DIST hypothesis-6.50.1.gh.tar.gz 9317775 BLAKE2B 8499b635dab07d0b39e1aae688c0324264688d768f5be63efdfb65f2237899054db0dc8ed050c5caaa2400aa009d56d91233128f587a849f4202fece155f3484 SHA512 315cc5cdbd36be8ec51f79b9c9f3aa401ce5fe6f6d41ff5ff30ac70c85d5540d2bc6027d8cc5aa8382b8746f7fdc37278ed870e5be42da13ae91bec93bdf5c69
 DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
 DIST hypothesis-hypothesis-python-6.47.3.gh.tar.gz 9314739 BLAKE2B 282b012e020fc6494b628ba629c576f604db831c219878ab92539fbd1d980f3363e490ef35f888b68902661dd82e682393641d13a882c1177d8570ec232b217a SHA512 c7231ff06ae5846f718e76c48ed4bb8a1fc0f9aff80c7ddd1ff0ead219eb93dcc7f9d5c5e591390661e81a33bcac79773ea620cfe3f246210114635f0c089144
 EBUILD hypothesis-6.46.11.ebuild 2005 BLAKE2B fb8a9862f49589a6bf5d8ddf74153a0c4246baaabfec70c1f07c1cb098709be34305ec921b2935b400c4fadbd61a3be4047ebf469cfab2745160aa72a430c558 SHA512 b187453909858b3397ea0d02aa029a89d06f51a539d08d7dbb2253abcff8e1d9226af315f2401e34debcbcc91cbb50344fc7197bbcb1647bb88c325c6940b6fb
@@ -10,4 +12,6 @@ EBUILD hypothesis-6.48.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b70
 EBUILD hypothesis-6.48.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.49.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.49.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.50.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.50.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.50.0.ebuild b/dev-python/hypothesis/hypothesis-6.50.0.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.50.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.50.1.ebuild b/dev-python/hypothesis/hypothesis-6.50.1.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.50.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index e67d445aad03..587f321d0d28 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,6 +1,8 @@
 AUX imapclient-2.2.0-ssl-context.patch 456 BLAKE2B b8811608129f647cb53b298600f3b0055a9061706693d0180586248d187529010fe043aa4cd88800cddf03b4b7747e484ed624abaac15645c1d0b99a253082b7 SHA512 547ce1528a7d15f0e6fd829f847acfab87cfc7da9261864917ae69b1cdc3e091011d51b7e470c7098d8665703d25bf718b72b55992a49fafb044fd97773615b1
 DIST imapclient-2.2.0.gh.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
 DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
+DIST imapclient-2.3.1.gh.tar.gz 91141 BLAKE2B c4efbdb4a513277039389e13d0f86498df3bb4c466026510fba55a8cf88316a3c5b02c15215e3e40e8e0b6206e8bd4659e75b1f83ba2a905a2aaec21f8af4b48 SHA512 06a9264e8cc001b8a4a6a855032bbb9b904c94999d090c3f1bedea1ae3a16524f668eb4dfa36e7a23a0622bd9d3e83191dcc1e5e30275cb6fcb7604142e5e2a6
 EBUILD imapclient-2.2.0-r1.ebuild 696 BLAKE2B eeee1d0c99ee35a92c59c3e1cce7a2f1b38a0159563cae949cb0d940d91d2911462c349a9d11176384561654a6b373239216c2f0bc1c18a91bcc900fa88fcd98 SHA512 6df5c064f9a08608e80bad92bf3539ba8336142b852cfac48e8d2e3b16cc890fb7b38273115c3e32e3e8cbb4d93212ca3d3c1776b77e8d9e6c67caa1385c80c1
 EBUILD imapclient-2.2.0.ebuild 633 BLAKE2B 11abf82ddda57c9225f79db80412513a0673fca5e7dbdc28e9406fad7f33ccb2abf971f614f1276bf17ae1e0c2c621737ed0c5ba7ce8c724eae3a459a3a666e5 SHA512 8b773a53b14573047aa84c7dbccc9fa0377dbc038ac436ee139ac6a64b2c2b3b3ac6613fd0a18cfbe6d9ed83b84f5ac065c0ca4ea207b2014d0b1075507ae9d2
+EBUILD imapclient-2.3.1.ebuild 670 BLAKE2B 83a6a7e90a519b5c54e37404e7f2e17e4d09e34ccaa8a15bd1d246a9914edf772bbdb3656d8603a5c7b614f6ea8f604c5257dfdbbc3bced8599a27f005276393 SHA512 f38fa68b41ce7f22948d5390e4b9652c76f87527b4b4e914fc025de80e811ed04d72de5311bd5fc33a16a9ae70cff373c410f6a16b159376274adde077cee0f3
 MISC metadata.xml 392 BLAKE2B 2a2a97b3882d544680b05e74e12067be2df1b910a37a08316540cdd7682beb16bbef184cac7c71ed51ce209187dba7803e34dd13756daf6ccafed343734d40f4 SHA512 b223e769302a2277d2638e58cb9c7ccfc741f582cf0465d1f9a44e6822539e1458d96e93d6b5a32482fdcc945b74e44b5bfc66caa53a85f224d4f380c19c1325
diff --git a/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch b/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch
old mode 100755
new mode 100644
diff --git a/dev-python/imapclient/imapclient-2.3.1.ebuild b/dev-python/imapclient/imapclient-2.3.1.ebuild
new file mode 100644
index 000000000000..c0b4db879005
--- /dev/null
+++ b/dev-python/imapclient/imapclient-2.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="https://github.com/mjs/imapclient"
+SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc/src
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 41cd38fadcba..02b829ad458d 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,5 @@
 DIST inflect-5.6.0.tar.gz 69251 BLAKE2B 49ebba7149fb550a75818a18a47c6524a046855c330d924bbcad7751b09538902cd1f9075a77922defdda1b8d29dd4966569c7f8c1a2364518cef96799ed21cf SHA512 c7cdd57d84b40c2479637eaf37089b2c5c16d738feb28c71f4fbd3fa4e08f0683c8e1a1e47904fb89afb90404ec8652e48941cbd2f1643dfdfebeaaf307e56ac
+DIST inflect-5.6.1.tar.gz 69306 BLAKE2B c465a962abbdda852fd778d09e3966bdb06dd34f56ef624a3f7d63e277b6e178d891aa23709d6591fe31a07acb3c25a7640aabb790ddf4493df82ab735963f98 SHA512 d908786d82e56871344aee716a2b8dd8da51b0f47af363916b47bceb04468ce6f3c321f5f429e12b10f06c100b0a2ebc249b94110518f33ed0844694cf0f108f
 EBUILD inflect-5.6.0.ebuild 617 BLAKE2B 9dc0fccb61e8cd8133edd89ad0b0fde7ad15783866cd06aadad9a84a3d7c75a715ca257210d24bfca8733a19dd722dfe36b3683e368a0175e06e6aba3a7ad0f5 SHA512 ae11ec54c11d6a463f8c965231f27af5f8efce904e8250f41ee0e06ed3f8d50e4083bc5e217ec7015fe67cb0a3bf7a75450def633669923868d4e9c15d2a7778
+EBUILD inflect-5.6.1.ebuild 625 BLAKE2B 0010d499b772531b632526ad5038b15ceb23571d0e700fdd172d4eba72f950953532126811efa54f69c88f71177796ec6897b9982573ff41a084fe44f69c83c1 SHA512 5c59975845ec5b1b94dbdbb92352b2c865ae49bfeeb040b7cb599f35b53f7497ba84db92eb4d7269b8b0c3059ad08640529b272103ee010133306a4ac24ed9e8
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.6.1.ebuild b/dev-python/inflect/inflect-5.6.1.ebuild
new file mode 100644
index 000000000000..ea873a0cffa0
--- /dev/null
+++ b/dev-python/inflect/inflect-5.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="
+	https://pypi.org/project/inflect/
+	https://github.com/jaraco/inflect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 8991289553b4..f20e6cd05fea 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,8 +2,10 @@ DIST ipykernel-6.13.0.tar.gz 131331 BLAKE2B 95a662b5ff6062fd8f6712a214b2bdcb2270
 DIST ipykernel-6.13.1.tar.gz 134356 BLAKE2B 212449f5e49f05052e36b60abc94ccfd81dcf6c13948d2ba32373ffab59f009ac28c251f6b9a9f5412b3d9a0f1347a2352f2e61b831d5efd8d45663ca43b4fdf SHA512 be0f5cf4eab8cf38f20a96e6e59971988bfc03105525694787d4dbbd092e22efb5b955ef622e0c8bc87fb43f29b0f4dc8affa89b81cd2eb7b4d9c93f7b9c68e5
 DIST ipykernel-6.14.0.tar.gz 134614 BLAKE2B 41c2d9179aae12aad207ff76f1451dd42beb4fa12123146a7ccbde2aaf12b52f374bd8d4e7c88bc26fed6e7a5b06629ce1e91ba87cf61e16d3de1bbd50edfac9 SHA512 cecefaf7221a640c5066b5bf77cb21750ddac78262aba6e0449e42f3db124624f87d88fe44351c6943753ee08d7b9a3780bcbb84dc7338e8e26d15c3ad6b1eea
 DIST ipykernel-6.15.0.tar.gz 134691 BLAKE2B ba3eefde9f1023ccf83c63a35dd99fdfebc0bda0d4f73e6477a098564c0a9fb7c0082413ae31dc8cf423339c3e44887bcf5253355c13630619f44b18d19e9913 SHA512 a6533f094d18d32a02e8de5638fdabb9f647edc9a512e609de3bb1d80f5592acef4e930d879bf79bde7a0ca23945d9eb112d841f2305204fac9f4c672b5315ac
+DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
 EBUILD ipykernel-6.13.0.ebuild 2019 BLAKE2B 31d026ca92036bdcdad7a1afd3d0ab6fb4e5fd924608f7196a6102169b2fe1a62f1bc155aeff2cfa9497ec6100ec8ba82d906e4bb1cb86ba16f4976323fd82e1 SHA512 df4d02205e9c0efd5a65a32730e0e2139ab94f713c6590431c303b0bbc3c2ae4a01c48cfb69ae6cb7c9253854cf2131601c35155ca91bd734df7ec7d84a699c7
 EBUILD ipykernel-6.13.1.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
 EBUILD ipykernel-6.14.0.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
 EBUILD ipykernel-6.15.0.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
+EBUILD ipykernel-6.15.1.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.15.1.ebuild b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
new file mode 100644
index 000000000000..5526cde6276c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 65043a7dd098..fbcca731201e 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,9 +1,7 @@
 AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
 AUX ipyparallel-8.3.0-additional-test-timeouts.patch 1707 BLAKE2B c3dc45f6b05fa7abf551d3b8a950e078a42a709a74d8fe8c45b88ab6afb7996f822550eadf46c54da18cb7596e25cc7ffc84b46e033803a665e323273669e0fe SHA512 9b7581e02571e498155a73ac573b8a994ed414f462cfdedc5a96d9d30dbdb7c44f9c1827f86232f2a0dc273f34901a46aa40a8822ebb11a74e0890660f2f77f4
-DIST ipyparallel-8.2.1.tar.gz 9367709 BLAKE2B 5be16c1060a31295e6b1908cfa3530d7ade6337de78ee057f595ab94ed5dc6c4c49b08f39ded0e8b6aa11ee7eda788f27b2f57bad851908f805d681e0b98efc3 SHA512 d06d1e272e27c0941f0fd6799cc78bbaf188ba1fb22f03016925ffbbf6b3e273eb8c372d7c0509b2f044ccfbfe3f35071547712e79a26a802e673340021921ac
 DIST ipyparallel-8.3.0.tar.gz 6862893 BLAKE2B 9009f0fa06422b4dcd9e920d6a568030ff9b20695f3a9eab0f730b48c08465bba7682929c139bac3ef65739be2152224ca922faa6a02b6d73be2f3fb572afa26 SHA512 01ae448cd3274aa752abb033706e77584bc164c7cad626970269e516d33dda949fc0bab9a5cc3f018b2aaac60ee55078780c02ba3c9a2079f12036a869a1f339
 DIST ipyparallel-8.4.1.tar.gz 6843301 BLAKE2B 1ca0056cfa6827f5eb145584ea634d224119a485f1139964988b07bcd164fe392bb032794098bccdf67b31f74030e62e917c0a451809e0d14fae323308b2b0ab SHA512 640489b3920b91e1b2f83def00a06e8ec45c61bd7ebe33a3e4a30560e2b0acdbe0a98a685d868dd7bce4c65920d378ab69efca75cf0ae7f164ee792c870a297e
-EBUILD ipyparallel-8.2.1.ebuild 3027 BLAKE2B 94de8d77abcfd534fa4406e442aeffe46e4c819cc1b220322a2f2d9afd47938c0bd9a162145a2670bc780b51626cc69f30d55e55ca9b9a8669a9f55576b55e2b SHA512 85f0a6fc5e9062b970f01ec01094df0b5d72989b1e22c58e3d5019b6952aeb1925ecd8b2b9b37efe586379a35adbf08ca28cbd7e671200bf323b634ddcfb473e
-EBUILD ipyparallel-8.3.0.ebuild 2702 BLAKE2B 8bde5cf32d35872218ec398d62392c0670f2130aa2667fb0a2271458e2b0a09df24f8e8c35e6e76243f58a5a7dc6effc36d8621d451a91429ef901586cd98092 SHA512 a084deb7c2322cd58a33e304308dceb0c2785376bcc2123b356002fbe842942b1a70194561e173541dceac93e9a29c3bac299264a366cb8bcbdcd25750491c26
+EBUILD ipyparallel-8.3.0.ebuild 2701 BLAKE2B bc2bbfceccf127376412f62f475b572783b611d986bf617686306c536909df9044e2e4fd80e97492d9c7f45ee0d05eb81aa2ac11c64f1490f8c5d600dbef788e SHA512 ce188594d14a605d7f9d931bc02797cc95de81490f97a942cce95afc6553e2f4dfcb86a2427d2d77385965ab8e91c031314673e5e3c715c9f09103c2c075ff4a
 EBUILD ipyparallel-8.4.1.ebuild 2791 BLAKE2B fdbdf8ee6076d451e8d8859cdd1072ad4a82d9da8a64d73f2f07f7a6cd4758df0c2d29fd37f1186feed1839c585fbc9052accd89c9f7678c029cc3e06a6df2c4 SHA512 caffc933b045f63c7510a40a01432048a772bc17e37f076bd8cbfd22298d5113e0d384ba37b8918252692efc32105a3df667c5317931a1b78191b890e6ffc64f
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
deleted file mode 100644
index 3ce20768a4e1..000000000000
--- a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="https://ipyparallel.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython-4[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
-	"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/ipython[test]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-tornado[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-# TODO: package myst_parser
-# distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
-)
-
-src_configure() {
-	export IPP_DISABLE_JS=1
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# we don't run a mongo instance for tests
-		ipyparallel/tests/test_mongodb.py::TestMongoBackend
-		# TODO
-		ipyparallel/tests/test_util.py::test_disambiguate_ip
-		ipyparallel/tests/test_view.py::TestView::test_temp_flags
-		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_arg
-		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_result
-		ipyparallel/tests/test_view.py::TestView::test_unicode_execute
-		ipyparallel/tests/test_view.py::TestView::test_sync_imports_quiet
-		# Gets upset that a timeout _doesn't_ occur, presumably because
-		# we're cranking up too many test timeouts. Oh well.
-		# bug #823458#c3
-		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
-		# We could patch the timeout for these too but they're going to be inherently
-		# fragile anyway based on what they do.
-		ipyparallel/tests/test_client.py::TestClient::test_activate
-		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
-		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# failing due to irrelevant warnings
-		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
-		ipyparallel/tests/test_client.py::TestClient::test_warning_on_hostname_match
-	)
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	optfeature "Jupyter Notebook integration" dev-python/notebook
-}
diff --git a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
index bc56eae4eda4..6693ba03636f 100644
--- a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 247b631d6653..06befc811511 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_core-4.10.0.tar.gz 76535 BLAKE2B d224b39397fd1ee430a758b02f8c5f2116480f00b4f7c485ccbb71556522275f7aaedeaebebf7bbfb782e3fff4677b38d5d7d0ddb4d3a24b5741dccd2b43edcb SHA512 b11257aa6239d2cc51b63c4ae696b5e2862fd824f662875a9e2b663a84b86aec14aa21baae6e5c720155f2be37fd40925b913503e002401eee442d6d3258704d
 DIST jupyter_core-4.11.0.tar.gz 73671 BLAKE2B f7e8855428d77fb36728199f76299686ffe0db0738a537ce7a540dca0fd6605371a1fe9cc32cf890fa21d08895cc1249f3e10cb2491ee0ce94de9eaf6cad08ff SHA512 bdd328df8ba2f5792e3fca01b816ed8994e56886b3d260467c5fda63180552753d807383135b7f8a84274e8a16099eed3fa5a211948d6490a57a357bb3b55a71
+DIST jupyter_core-4.11.1.tar.gz 73661 BLAKE2B 38f93826fd86f5b4dcd5495473426e934365aea3156e6bd881041920b5604a7ae11becc3d1037785f448f085b03e5afa361b7221378425e9e758fca90ed850e4 SHA512 38348e8fc349ab7bdc83599607e6179c2d14dd3a42daf6b52cb0a6fb4feee360aed4e7c682e6349dcf560b2dec598f9a27477e0b2e982fd85e5a385b1bca5858
 EBUILD jupyter_core-4.10.0.ebuild 699 BLAKE2B 3e8c3f9c3c9f18cd45a6b4c29a9d97320d6563c502c28603d4150b8efc4123ae845e4ef69a3b4a39b29ae15a682e7d42f37c5d671bdcc1d88417e021c92b26c4 SHA512 dd2662c46606b2ac3b74e013403cfe22eb7898b0ea43b591c84cf5d059c8c0f3ec63e6228b23151ff600cd1f3c8bbb88c453e60ce47fe031330fdf00c0d25800
 EBUILD jupyter_core-4.11.0.ebuild 670 BLAKE2B 54dda3ee90ac06523760e3fc844431b5459c5923dee8a0adbee3b0efa3d722fae4cd6479e045e9aa25942fe92e1e009ac1481ba9765ed86b7622677ef3d8b72b SHA512 38e976b33d61aae618827588647a1c523ebb431a572505ce53a125a7fed3f64c1d36d881ef2c2f273ce65c09286bc6fb1b965ccb347eef915ed4a16d5c31608b
+EBUILD jupyter_core-4.11.1.ebuild 670 BLAKE2B 54dda3ee90ac06523760e3fc844431b5459c5923dee8a0adbee3b0efa3d722fae4cd6479e045e9aa25942fe92e1e009ac1481ba9765ed86b7622677ef3d8b72b SHA512 38e976b33d61aae618827588647a1c523ebb431a572505ce53a125a7fed3f64c1d36d881ef2c2f273ce65c09286bc6fb1b965ccb347eef915ed4a16d5c31608b
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
new file mode 100644
index 000000000000..58d1fe82bb25
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 683f7ff03b8b..261767549a21 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
+DIST jupyterlab_server-2.15.0.tar.gz 61443 BLAKE2B 48ead96f13caf747cc14f7d65dc6104822dcd0fe17315a2cee4111598b40f05119998f169aef90411e84fe24e8f09736c857325752cfa3f22047acb2a9e2e3c1 SHA512 27530b293ad7c171b280a4c165d7f983c85238c4cb0bc89bb2eda8493b2988f047045c842ba456df9d0bfef00b5ee28b061c537ef6293d726c3a4f3d6572727c
 EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
+EBUILD jupyterlab_server-2.15.0.ebuild 1751 BLAKE2B 78194ccd23664839271fde49bcdba89d775028d078ef33a54796866dbf8050b23403839d7236f909a3e1fe68f930ea0bcbb9b9697b116f482977b8039fdb27d4 SHA512 65006064e30c9b8552f1c6df538bd0b779ff7922021fd83b87bf03d5794ee27cb91be970d3d2d6a8d68db8f5a374844f495e206af94e065a662189a4f07ca632
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild
new file mode 100644
index 000000000000..88f6833ba9dd
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_server[${PYTHON_USEDEP}]
+		dev-python/openapi-core[${PYTHON_USEDEP}]
+		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_prepare_all() {
+	# This seems to not work for us, can only find english
+	rm tests/test_translation_api.py || die
+
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index e84b8a3fe07f..0c5e8c662b6b 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,5 @@
+DIST kaitaistruct-0.10.tar.gz 7061 BLAKE2B 2d1f8c00415d43223b53c51ca185d79c8fdd9bbb1e512d2e3b8b800b5e7f52e90c35b869d8f82a116f15cc1f1222c41a62a01d07a7f62c567a4d7a82c0657d52 SHA512 b4db8b67fe5dd310121ecfad6db79d424e2bd7308b5ae2cc1cdbcd73538533b5bbe4047b71e2ff65d8109b213ad0a5b88a96cd593b08f910ea6ae9bf3c4cbfac
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
+EBUILD kaitaistruct-0.10.ebuild 495 BLAKE2B 5ef7e46e690cfda504e89e98492128aceb922c531f5f099209001e7100a9493b9f65f8346f0d50bd8c4bf020140cb0ec1dedfdb219a7ea88840d87b8a8397f6d SHA512 23238402afd422550d45ba73c7707ea3289a3f0f757a6241ca938c624d06e75b25f1d28bb87db2fc697d6f174876d38e6247d199c364cfcf2e452d99eb5035a8
 EBUILD kaitaistruct-0.9-r1.ebuild 390 BLAKE2B f8b622eb667227fd3ffbba734c9f29480f920ddf10e00753e2bcc1fe0afa7b3a02ed9d35bd6ce9f1a4ae390489f8b79922883560d63dd16a186b7a81b27d2e72 SHA512 67267819325d8ebcf457a40e2974a01fbc122596cb484d7556f24daf47739f72ea9aea0c0cf2d1fa270158be9c809d3c4cac20febb8643148c20a2ff0b4702c5
 MISC metadata.xml 666 BLAKE2B 181ab1c55ef3e407cecb2e140d0a33955f2499a91daf0fbc8856b7faa28a142ab706f05d9eae9ed1043d7d7b148b435f98a4afb635df234559f2996e8f3f75bd SHA512 e29651517b39fc0be833c92edbe1e83d5591c1cbdc0a40019353b82a154c303dd08f87e1d36436ad4ff9c67cda95aec6c6ecaad62bc18d61c949054960d2d764
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.10.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.10.ebuild
new file mode 100644
index 000000000000..0dbe4ba3e752
--- /dev/null
+++ b/dev-python/kaitaistruct/kaitaistruct-0.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kaitai Struct runtime for Python"
+HOMEPAGE="
+	https://kaitai.io/
+	https://github.com/kaitai-io/kaitai_struct_python_runtime/
+	https://pypi.org/project/kaitaistruct/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
diff --git a/dev-python/matrix-common/Manifest b/dev-python/matrix-common/Manifest
new file mode 100644
index 000000000000..f6fa52d4020f
--- /dev/null
+++ b/dev-python/matrix-common/Manifest
@@ -0,0 +1,3 @@
+DIST matrix-common-1.2.1.gh.tar.gz 12598 BLAKE2B 94f25d90c9df948054739cee39033c1f261e61300aa74b7ce606cf8a3c82e716687aa57ddb0f72b8617ae56c21486b50a68f9e6c8611e2f8b19c33b0d2a557e7 SHA512 9ab05d6aeddf4915970916d34e625b7a059823e56ba8868f955cf8971a51ac31891304a7fb00170c60c6b107f7526565f67bd78416a466c50092954c5b422114
+EBUILD matrix-common-1.2.1.ebuild 684 BLAKE2B 5a032ee9d28dbb9eb56754966fb4d6381a777bebc9a88efdf5a08da9b83c731fe2e7e108653e17a8563f47f5347b552ebcace2ac152fa5a4c5ca67546bd0a498 SHA512 7ec15173120d7c18e900d6628d0997aeb9db9762c93878f3f851b2cbcb1945de0c868e0b92ba2902d6aff9910ae60270d2e1886df809fb308d26cc96f128efb5
+MISC metadata.xml 538 BLAKE2B 3f2762e9f75ccd4f288edf89417b6a3556628e4b8525e33346148ccffbf772024556069b6b3f59ac71c2a262ec4644e83fabc1ed872741a6b999992cbba454d8 SHA512 ba1bdbf10e9ecdd0e83c483f625366a0467e4be65576450fb5721b2bb1e1b06785ca8a71b67f5b3e1858f756d2463f8623a758c64e27a6aa8ab1e780ddbaf704
diff --git a/dev-python/matrix-common/matrix-common-1.2.1.ebuild b/dev-python/matrix-common/matrix-common-1.2.1.ebuild
new file mode 100644
index 000000000000..fbbe4a43703d
--- /dev/null
+++ b/dev-python/matrix-common/matrix-common-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common code for Synapse, Sydent and Sygnal"
+HOMEPAGE="
+	https://github.com/matrix-org/matrix-python-common
+	https://pypi.org/project/matrix-common/
+"
+SRC_URI="https://github.com/matrix-org/matrix-python-common/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/matrix-python-common-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/matrix-common/metadata.xml b/dev-python/matrix-common/metadata.xml
new file mode 100644
index 000000000000..88ed39af8ea2
--- /dev/null
+++ b/dev-python/matrix-common/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">matrix-common</remote-id>
+		<remote-id type="github">matrix-org/matrix-python-common</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index c42ddcc8bd04..d10a5b6ea0ca 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -2,4 +2,4 @@ DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7
 DIST nspektr-0.4.0.gh.tar.gz 6763 BLAKE2B 6393a2d16825cbd580758ba09a7f2277417fc0eb4e7c6f23d49ff1af89a7c6947d4c0bae7158424b96f8f0e3e3aab6ac3f5bb624a8d7edf61eb571b28e690d70 SHA512 c106091e949ce8236c1cf54543bebd2b63484dff95e161fb57668bd6bcb4b17ddf0ecc440c15a0df36cc8c4398ccc439b642eab49b528ba2cbedc75ff009179d
 EBUILD nspektr-0.3.0.ebuild 1743 BLAKE2B f455eb064a5e15d5a2162da586148a4a8568a7f8e951407d32b4dd3211435d1ee4ab8021f33d9e7938058e1637455ba1744211796862854842bf2e44a956aa9f SHA512 4d2875ebd1004be37d1b2ae1c5825fe137532b96ab942f8912868e5eea4434b1d0091003831428a9a9d907c69198760b5ac5ab8221d7b1697de30e1e53ff2199
 EBUILD nspektr-0.4.0.ebuild 1618 BLAKE2B 9657cc0d10ead056c40be7bf7b03da0713dcb11c025a5da648c0030794a93b3782741a912cc342a14675a46b7c4a6cf5f3331ae8255d76a70b24d05570d62125 SHA512 96f935b20516268627ec925bf4ce4264833befaeeeb7ab7b8f0aa5edaf21886625f4ff39fe66a2de66182efdb4709d23d076b91f95f6146b308aaeb92d95a771
-MISC metadata.xml 343 BLAKE2B c5ec4b6c1f41692875fcb9a93dea4c0f253339788b94fd667709898e2cc49470f113258137093fd29986ed8fbadf2ea64f95319c51568f12259b8869558bfdab SHA512 da052d5ee619430fbfc021b9eb8d3967dc4d6ca3ce0bc5c9b1badb067d7c0babe12abde3fbc9c4710bc6a0cf081e6bc445504b852ec714f819781e1c4780779a
+MISC metadata.xml 367 BLAKE2B e0c1c36f285783d80f298d38d3821fc4aaaf81b83e2a0226972105093406446426fc7e62c3a92138ab2a925e04d1fb58744cb3d51b62941b1118d3b3628aba71 SHA512 bbb3c37cf215be4b8fa83d0c9a592acc3dbd60bab0afeb979fd343b80c6b71766c155b94f7fd8a9f835330f4038194c9bed0b91b2bcac94b1c75409f92f5c9f2
diff --git a/dev-python/nspektr/metadata.xml b/dev-python/nspektr/metadata.xml
index 8d6c012216d8..65c8f4e628fc 100644
--- a/dev-python/nspektr/metadata.xml
+++ b/dev-python/nspektr/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">jaraco/nspektr</remote-id>
 		<remote-id type="pypi">nspektr</remote-id>
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7a8a7529078d..a539af3580d5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -10,6 +10,7 @@ DIST numpy-1.22.2.zip 11447735 BLAKE2B 43dee4d06139822b1eec8280591ddbf6629bc8b92
 DIST numpy-1.22.3.zip 11451867 BLAKE2B 0212cf2882410f9d9083fe40b3630733d0e407cab32c7aa10affc138e6305fdcba119a7a2d1b6c3dd5b99765d9204afa5ac8e389369ca933e779e5a647271605 SHA512 fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f
 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
 DIST numpy-1.23.0.tar.gz 10714532 BLAKE2B 8b7784adfe4aba8a21a50b460b908cd20eede912f46cc6840a65c03f4f128123ead64e61768ff839a6a79797680a5189ff39284be5819bacb6eb7e1902a09656 SHA512 899d0ca062b676b64de0da204339694dcb7e52f257625e971f9a8ad7267206a6ad2924353e4dd1e153b4a64ae318380899c9e1ee7a6f53fdeba4c19b34917583
+DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.22.1.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
@@ -17,6 +18,7 @@ DIST numpy-html-1.22.2.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf76045
 DIST numpy-html-1.22.3.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.23.0.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
+DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.22.1.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
@@ -24,6 +26,7 @@ DIST numpy-ref-1.22.2.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb7
 DIST numpy-ref-1.22.3.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.23.0.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
+DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.22.1.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
@@ -31,6 +34,7 @@ DIST numpy-user-1.22.2.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c
 DIST numpy-user-1.22.3.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.23.0.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
+DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
 EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
 EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
@@ -38,4 +42,5 @@ EBUILD numpy-1.22.2.ebuild 4522 BLAKE2B f3dbd009337631f3f72590d4ed8e1dfd910a624c
 EBUILD numpy-1.22.3.ebuild 4809 BLAKE2B 591d29cf3f8786179f8c883d185357db303bb90da5b577d4fc8c0d548bfe2296d247d10901ae931e276db68e2ef197c38a34740767afe9f091b5bd266ae50442 SHA512 a2973b01c557c5956ba9aebb8f9a15c56fabc321a672f61b06e19fc0f83c03e04856128eea37453b57797ee5f45572952dd67f51436a493ecfdc7434cfb6688d
 EBUILD numpy-1.22.4.ebuild 5025 BLAKE2B 3d338b40070c780e77bf4465835f8335edd771a119fa9a44b52db33b6951a224051ec44faccb9817df893f4ea11202538284a21c199127bae31eb200e17ad9fb SHA512 fb389e0de7d0275f548b86b2ed414ee974cae6456021f63c1696b7d5d7a0f523dc1a6e4f7db18db6af7a61d5113203c504d857fac809c96beb9bef68f5ea503a
 EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
+EBUILD numpy-1.23.1.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild
new file mode 100644
index 000000000000..5ffe8b0b6d7e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.23.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+# For when docs aren't ready yet, set to last version
+#DOC_PV=1.23.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	doc? (
+		app-arch/unzip
+	)
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# known problem
+		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index db215bb22b0e..109dbefacf7b 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,7 +1,5 @@
-DIST pdm-pep517-0.12.7.gh.tar.gz 304959 BLAKE2B 0571a77803b999f88f38da843c5fcf126eeb538c6812c3e245be2fc14d6cd19929559985efba2d245bbf0efb00e412b2133fca6bbe9e63317e6b7311867e0072 SHA512 45da8ab31071a57062fac5b89abe7d912d787d647eda1b45fe3941c43687fe0fe5c8d11e539290035375e17eef808489000513e3128708fcefd851e792757b8f
-DIST pdm-pep517-1.0.0.gh.tar.gz 307117 BLAKE2B 6af1cbeb10bfcf040aaaaf60535d660c00ad84f0a186b508112e224df7eed417ce97ec1bdbf2764549172ecbededf4e9b17b6ae915b71599f04d09f2103c0a7c SHA512 cb8c02af8c4f00cf68e6379c2e93aa0ab7d30f4405debb62f7c46afc10596ab440128f1a7444fe6989d5eafb462bbbe0cfc83325bc1aba92268498a3d96332e8
 DIST pdm-pep517-1.0.1.gh.tar.gz 307357 BLAKE2B f833179b0ea011c4304625f08d3eca85b17163d4af6144f72e6faa2fe1091f9607f53ae051fca4e837009c3132ad6f06ae69cc5288ca8731ffb1ff2ef555d0d0 SHA512 7d90829a351e95f7b53f53d356a60cb170036059f5e6311df46989253b33f126f384a93cd6aa22c95b1ec7aa501e13773ccafabbb41e5237e84537b73dc43f58
-EBUILD pdm-pep517-0.12.7.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
-EBUILD pdm-pep517-1.0.0.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+DIST pdm-pep517-1.0.2.gh.tar.gz 307938 BLAKE2B 711cc77c4ec4a3002557b5537c931215254d6fd724bf80f5457750100d55aba580b0f5fdbf8b17a31e5b02b42a94b62bc72eb99693fb59c3ab76364666b51b15 SHA512 bb827a6130299acab18714c7380f81fa530b95e3bc1e78bca810c116472269f050df45d04ef69d90a1ad96dd6bc965a50edc01bc9c429b96eefb76d62c66b8ae
 EBUILD pdm-pep517-1.0.1.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+EBUILD pdm-pep517-1.0.2.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
deleted file mode 100644
index 65915f36678c..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.2.ebuild
similarity index 100%
rename from dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
rename to dev-python/pdm-pep517/pdm-pep517-1.0.2.ebuild
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index c48645033650..0fff1a1d7894 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -3,5 +3,5 @@ DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d090930
 DIST python-phonenumbers-8.12.51.gh.tar.gz 4903034 BLAKE2B 6d97e25c3601f817ad51eb8dac550fec4a13799dd9321235c9105386ca2a1ab3a7fa6403f31643197a5a2f162be50edf6b3705c8947098f2d9ff744f6af1dab6 SHA512 80f5ad4356e31bc505c929a8bb9b577ed1571b9173e7f8faebe972f62c16f5a5d764eab5e3bd8aa939faae2c4ebbe2b0fa11a5f2e6fe334be98148a68881c912
 EBUILD phonenumbers-8.12.49.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
 EBUILD phonenumbers-8.12.50.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
-EBUILD phonenumbers-8.12.51.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
+EBUILD phonenumbers-8.12.51.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
index 3b1d20a349fc..baab22b23fc7 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 211e9a9cbafd..3435aa66ca86 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,5 @@
+DIST PyChromecast-12.1.4.tar.gz 51527 BLAKE2B 5a30863553df0f7cfd59de0ae5fca55b84373bb7cc6d12ac761aa5e6d18b1548275a677466bc596c0b50d8b78b385ee5bb727d2eb4828a1b24e3c64a0dc4a035 SHA512 056c615f453ccd97425a68f488235a63e8047d1be40fc7800d154b19013e7a0f329488b25e76f0cc56adb3779fd14d4e793dc6488ccbd067b484f0e2be72e455
 DIST PyChromecast-9.3.1.tar.gz 53253 BLAKE2B f246a38c79ececa17721ba2d8397da691310462ce9b19aab2ad525d82ff8c4db213fbc8fa3e9205bac3ffbde72f7bd75eab26c6b5430921bd2fb561a49808110 SHA512 ee4ad719a1142e1a4c67b99b6ceadfd076cb8b818474c5a5b9bc9dd2d03f13feddcece4983459013192f85bdc73339749d0b2f2c1881ac879d211dbe2e578605
+EBUILD pychromecast-12.1.4.ebuild 596 BLAKE2B aefc0fdd82a64c6ef10c07f71b29605a5664dfb6f8ca1e446b684967e3d276fc9c707f614f3898df0625de0506999da743dc65750ca51efa15e32505f52f1d7e SHA512 d2cc225d773ac89378208b0f5474c2d7b23a7662c0bd5566370d8b09dde22fbc022eff76d427bcedd6dfcedf5c63c100b96a0376ba0c027f4c8dac990ecce264
 EBUILD pychromecast-9.3.1.ebuild 596 BLAKE2B 158965ea36bae2fc1647501751277472a11bb2280d324f1a0a1c2feb649c1f8d719a6995851bef76743d1e3d2f4db67775cffaa0b34f2f13a0aab327849aa39a SHA512 de54772e0780df6ca47749f7fa5ed9d1a497e2e659847500e61681f827c358b0df46d5a42b6be103f241d44fa53ed4a14ba3d6abc125b3c137b580f4de7a2d4f
 MISC metadata.xml 354 BLAKE2B 20ef68373d5cb62e00da147728ff8f59faed7dcb88315c4460e1a6ff7cb31d40d56e639974d8494ab085c6b7faefffef6c51e4494b0b3604dbe9e3ab909adef4 SHA512 79684ace1b10ffce070e3fc83073b110e31fe2efdcfbd56b84c961716843f48d1df7defd330ded7862e006cb3f8d665de16481a16742922da450ef40bbf1209b
diff --git a/dev-python/pychromecast/pychromecast-12.1.4.ebuild b/dev-python/pychromecast/pychromecast-12.1.4.ebuild
new file mode 100644
index 000000000000..98762f508af9
--- /dev/null
+++ b/dev-python/pychromecast/pychromecast-12.1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module to talk to Google Chromecast"
+HOMEPAGE="https://github.com/home-assistant-libs/pychromecast"
+S="${WORKDIR}/PyChromecast-${PV}"
+SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymacaroons/Manifest b/dev-python/pymacaroons/Manifest
new file mode 100644
index 000000000000..125d053761d4
--- /dev/null
+++ b/dev-python/pymacaroons/Manifest
@@ -0,0 +1,3 @@
+DIST pymacaroons-0.13.0.gh.tar.gz 25607 BLAKE2B ff21e88842c54f7ce84e8b3ad59d42ee43f2bb2073ebbb7f47dee123086c1466024420246a4da2eae462bc36e44a3621b75144846e090073c5063b0af24f1ad1 SHA512 60da7e03d68083f8effdc06b338dd04dbd6a39ff137373721af09f1282fb035f969459d2ef80f4d728dcf95f6244b7b2de443e48658e0551462ab46daf3884a2
+EBUILD pymacaroons-0.13.0.ebuild 746 BLAKE2B d13403d01df6bfd5cc2b9fd08c04fb1460e5f8274e95d80653f9b3a1022bda3f8e364bbf2961c44cdc93b6f7c4207808779917349ddd7e53d1bf3d1b12d45edd SHA512 ac50305fd2324421eb9b525a2dcee7392d3329ec47a2e014a458d80130223d94749c39fa9f4fcc8933aaa320e13ed0dc76c40a741783b19b67543697c428e4e9
+MISC metadata.xml 525 BLAKE2B 5e4d390565834de4093dc6b579e1aef4fffd3a97b3d83aa038e0bbd4cb1e28acdcfc8bf5a49bd7a2988e79f1dc868c2c3ced235ba2e1917c0f37b915a25a1584 SHA512 bd4bbc4408659318126f279c33b9fd8335c8d9620014ce72594171b28b3ffb2cdb044cd67d560434c849a8baa1d1b21b0c9b16d8e47954b7ea64f170c9edbede
diff --git a/dev-python/pymacaroons/metadata.xml b/dev-python/pymacaroons/metadata.xml
new file mode 100644
index 000000000000..5126b7df482e
--- /dev/null
+++ b/dev-python/pymacaroons/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">pymacaroons</remote-id>
+		<remote-id type="github">ecordell/pymacaroons</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild b/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
new file mode 100644
index 000000000000..24e60796d20c
--- /dev/null
+++ b/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyMacaroons is a Python implementation of Macaroons."
+HOMEPAGE="
+	https://github.com/ecordell/pymacaroons
+	https://pypi.org/project/pymacaroons/
+"
+SRC_URI="https://github.com/ecordell/pymacaroons/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests are incompatible with dev-python/hypothesis::gentoo. This package needs
+# <2.0.0, because needed hypothesis.specifiers module was removed in 2.0.0.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pynacl[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index eda1f88261e6..13b395185fa4 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,7 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2022.6.2.tar.gz 383342 BLAKE2B 48587a91366203301c517dc9cfe4f09e70905924484b906481bc89cf376854d406871312e154ac8b5833feeb50848636a95fdf99511df4feda4f16794a70856b SHA512 ce69a058aa05c471ce8728d29d5a498e387e5661d754d13bee51558a85f5e9e059a1464cc1b7721294cab421bae7219da7fd067e331e6cd6fd3dc464fdf0ecc1
+DIST regex-2022.7.9.tar.gz 383431 BLAKE2B 9773b3e5c516d79ec6b37d288addb0638016716093ec49d8cdc4a2132fc16ea76c4a21fd02cc6bc6547fd0dd76bb0ec9984bb7f41eb88e4f89623a8d4a5be40d SHA512 0c8b78fc10e5ba4e95a3603a4958efb610168b63a490715c2556243af7bab4d04e6eab6cad6bc98816cfa94209404806ede28cf48643d7e92c9b8323c2b0c5e2
 EBUILD regex-2022.6.2.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
+EBUILD regex-2022.7.9.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.7.9.ebuild b/dev-python/regex/regex-2022.7.9.ebuild
new file mode 100644
index 000000000000..d864a4bd8ea3
--- /dev/null
+++ b/dev-python/regex/regex-2022.7.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://bitbucket.org/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 050f8ea5e92a..e97f619ddc2b 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -38,10 +38,15 @@ DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19b
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST pyo3-0.16.2.crate 350698 BLAKE2B dff6af75527ed3e34839e25810663ba0a1210cebaa4be0030b5fe1032fcbe93e813b9b3ca1398e446cca62ac5d77a025e40c32884f11caa7787fd35fef48af57 SHA512 b4de2d2bd631de6bcf3cb29802d634b27cab36c4f18a6dbf18f44a8e634e105b1222a9342c2978da701f43047e1a2fff41b8ce1efa9def92b5e97063f1a29b37
+DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
 DIST pyo3-build-config-0.16.2.crate 23501 BLAKE2B 0dc159f6059d64c7fdc8f287c6785b5db626b5776b5564be2ad33289115ee2cedce63131b8d747d913ac22cff4949b9ded7695672f01bfc6eac31b99db8b7c45 SHA512 ef645bb2bbc408c9e566ee6631fa669a54c51d9c751544f704b6b23852e5575e5178d138a677c4a5cd89d432ca48fbd771b4464f512302ff01e9dc0057aa7897
+DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
 DIST pyo3-ffi-0.16.2.crate 60227 BLAKE2B cb19ce27510afa61cc0e1f40f27c2cb359fa13f72e9bdef499ecc8d925eac482c0c886dc8175fe0c8e775ebf88a09a55e8ce9df6b672596a8a0fbc1ff4807153 SHA512 2de278222eb74e4cbc67be5ee790de5ba76b06ad3ab09a2fcd0bdb8a1c6daab551a3948d58fd713277150a6cf35a39b71160809990bc8277ed631135dd1ecb2d
+DIST pyo3-ffi-0.16.5.crate 60737 BLAKE2B 84907201cf48e57a6b692a9261d67d005d0b773965116dd22d679eff2a3a02ee4f59678dde896635052e62c55ee2703f30726a65651a0f38fdcb31e8c95e3059 SHA512 8b4a486dfd204ea5c394b6832f5e2ead5cd88bc2a943bbc156fcf70e8212be6fa96af5c9ce06ce28a2d0e702fee858f26b49094070e00be658ffe3fa84265496
 DIST pyo3-macros-0.16.2.crate 8027 BLAKE2B dfe930ba1e718b8626743a36eb395e62010609cde6a58ac324da3137c3d28884b61c2d99efa52091d4cdd9915cbc7c7ffa65b75b851bb9b0f63b492f5621d3b6 SHA512 4988a4f4167f1408bd31454520113419af94f24b0d58c7887345bd5ccda4f6d6c8b3fb5e317a55ecbb2401e1cb0a0c8224ee9d3a7384cced6ef2bb54c0ed0191
+DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e7532d7c79889ad52693461a0966e69a6cf29d4c2c8da19bce7e7d05e8c103dddccbb41667c69b28bb15cd388230 SHA512 c4f4993ab67d2f8fc6f1fe5c0eeffc00c10024e201c64fb49f3075f5c33af63d2d455f7696b094fe9786091469a27c5472cb11aea3e9c3b73404578ba76a93fc
 DIST pyo3-macros-backend-0.16.2.crate 49378 BLAKE2B 9227c6e7e29a316431adf697675e38c267fc2b18423c99b0198739c8eda91b028d8ed1ce1841cd29225db1827e1449ef95db04941e51466be6a266487de63d96 SHA512 5d6a4292ba8ea0910d209d59f8f8cf7e5b00a28d940d8ce2a221c28b782c2f98fde20fdbbedee8aab2f741ddac3a6267fb17a600c00964c2b155a5e43a841510
+DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
@@ -56,12 +61,14 @@ DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
 DIST setuptools-rust-1.3.0.tar.gz 285698 BLAKE2B ecd1a2cdce5a9b3ca7c648c97d472dd0ed60db3738d44cfe601c85ac1cd8f3924cb82fe0a06f02a70d60cbe1956c324f3fe0153275c7bae75a14a21b242ecda7 SHA512 5971413a9544ddd626671de74e9517fb20410e4838c5420ed31653d7fdf07b858ff4ef14ec2d5b51677e3402757da915a76858337d0c2b164682450bce35ba11
+DIST setuptools-rust-1.4.1.tar.gz 288848 BLAKE2B 28f4ac618ae3550158814ac14b87d628ce16f140840c3948d48f486cb5a7f50389eccd78385fe3e5be635dad61bf19e25464d39567c2fc760e247d5a2e692145 SHA512 3b92eb37564872b4094e77c8412b006f57a3557213d1368e2db883bc04f5d0d516a97a5b1f0b5255b362ecc32832d2ef734ac759a49db72439f227d54f8a86f5
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST string_cache-0.8.3.crate 16261 BLAKE2B 6c94d4158c095bbb82bc2daf071a698e4dd900b5a8dbce21f7a7020005d614e8d5156cd32d4118670d85168b0faa835c54026729285cb4feb7ed8a0551e9ff20 SHA512 337f1c95393c719d96d9dc7c552b744271f89c4ccb70efada8a48331eb619cbd761eee5a6f13c41b214449fd9ff29439473d33ffe3eda57d78ec90dd9aad88dd
 DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
 DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
+DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
 DIST thin-slice-0.1.1.crate 4484 BLAKE2B 7efcd3c30dd24c22641139288b0c530ffe56dd82f26c2c31f557f1fa09ced695cf12b645fa6bc4c12324af0b9b05792a9cff422b6deee3bbb06b57a7cec06f47 SHA512 27b9e6b2a8485b3f89f659d80d67ccb96370f3371996e39f97784c40bdd7fef5429fb96f48d9c045eec5906051708f169fe4ca8f5f546a25e5f6859cafa42925
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -72,4 +79,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD setuptools-rust-1.3.0.ebuild 3146 BLAKE2B 671ce00aa0426e11bbafd55fccb561e624b15b624427bcd34e424cceaebe9f70212d7dbf847b9a3b1a63c419b1efe74a99ecf0271a5c4d10d4ee647d550a3174 SHA512 96ef6d93b5d23f3479a958af6d4a3dc5ef24e94a2f1ad6110a360256faaf9b9bdaf245a9e014aaed08446b4b9568e1eb3193caa69f66fa4033d66a709b1c7f8b
+EBUILD setuptools-rust-1.4.1.ebuild 3231 BLAKE2B a38aa1b121199c5e3e21ba765a1b4c5d7efa7f6171768810bb55b7208b59cf76bd4b87768df0783957d9cd28f7a6b91a575203f742fa6eda989abb62e422ef8f SHA512 b6c8fde9894cb462564185c6a13ac59025041f257df3653efa5f8ba361b6c9d7790cbfe4cd330907602ced74b71080ee098e33e7f6bc0cb12dadf0907dea03b9
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
new file mode 100644
index 000000000000..d1f06304937c
--- /dev/null
+++ b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+CRATES="
+	bitflags-1.3.2
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	convert_case-0.4.0
+	cssparser-0.27.2
+	cssparser-macros-0.6.0
+	derive_more-0.99.17
+	dtoa-0.4.8
+	dtoa-short-0.3.3
+	futf-0.1.5
+	fxhash-0.2.1
+	getrandom-0.1.16
+	html5ever-0.25.1
+	indoc-1.0.4
+	instant-0.1.12
+	itoa-0.4.8
+	kuchiki-0.8.1
+	lazy_static-1.4.0
+	libc-0.2.121
+	lock_api-0.4.6
+	log-0.4.14
+	mac-0.1.1
+	markup5ever-0.10.1
+	matches-0.1.9
+	new_debug_unreachable-1.0.4
+	nodrop-0.1.14
+	once_cell-1.10.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	phf-0.8.0
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_macros-0.8.0
+	phf_shared-0.10.0
+	phf_shared-0.8.0
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	proc-macro2-1.0.36
+	proc-macro-hack-0.5.19
+	pyo3-0.16.5
+	pyo3-build-config-0.16.5
+	pyo3-ffi-0.16.5
+	pyo3-macros-0.16.5
+	pyo3-macros-backend-0.16.5
+	quote-1.0.16
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	redox_syscall-0.2.11
+	rustc_version-0.4.0
+	scopeguard-1.1.0
+	selectors-0.22.0
+	semver-1.0.6
+	serde-1.0.136
+	servo_arc-0.1.1
+	siphasher-0.3.10
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	string_cache-0.8.3
+	string_cache_codegen-0.5.1
+	syn-1.0.89
+	target-lexicon-0.12.3
+	tendril-0.4.3
+	thin-slice-0.1.1
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	utf-8-0.7.6
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
+HOMEPAGE="
+	https://github.com/PyO3/setuptools-rust/
+	https://pypi.org/project/setuptools-rust/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? ( $(cargo_crate_uris ${CRATES}) )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/rust
+	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.3.2[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_test() {
+	local examples=(
+		html-py-ever
+		namespace_package
+		rust_with_cffi
+	)
+	for example_dir in ${examples[@]}; do
+		pushd examples/${example_dir} >/dev/null || die
+		einfo "Running ${example_dir} test"
+		esetup.py build --build-lib=build/lib
+
+		case ${example_dir} in
+			html-py-ever)
+				pushd tests >/dev/null || die
+				local -x PYTHONPATH=../build/lib
+				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
+				popd >/dev/null || die
+				;;
+			*)
+				pushd build/lib >/dev/null || die
+				epytest ../../tests
+				popd >/dev/null || die
+				;;
+		esac
+
+		rm -rf build || die
+		popd >/dev/null || die
+	done
+}
diff --git a/dev-python/signedjson/Manifest b/dev-python/signedjson/Manifest
new file mode 100644
index 000000000000..c080a1ffefa5
--- /dev/null
+++ b/dev-python/signedjson/Manifest
@@ -0,0 +1,3 @@
+DIST signedjson-1.1.4.gh.tar.gz 12714 BLAKE2B 854f28074b82490bbeb6a0a0b3528d608b2ff6f5ff3cb52c913525b81f483afa6b4c8423dc25d9adaa3c3a9f269ec54409af0e7f8b5ddf3903e33a9b00c0dac8 SHA512 8928b9ecf1d6a9291a07bc3270ef57a824267ad45c114cfb720fc4db36415301f6bee26db9bb447e0051d3366c5471f718f37238bdd841bd06e73f5841f13ed6
+EBUILD signedjson-1.1.4.ebuild 839 BLAKE2B 92836acb38615a9b6fd88326d9bc9b0e2b80532724ea31c840e55a6691936a1ba780a522c07ea1f65ab366f795845f911436da71d0a56dac77b12d16942ac841 SHA512 9ed19cb75a7ccb5d7b07bdec429213a76a77dc9e6315daa3f00b1d488be4f3a80c18e3fda42e5789e6cb10760d80e42cc1866f912c428c14ed664f611bc0b03b
+MISC metadata.xml 532 BLAKE2B 8b29e244049e74a5e10313104a9988aca0027530d063a60f834810c5df64714aa9379bc7a3ea6c4295d3902b08a7edd1aa67a225ce0ac390d48092502edc0321 SHA512 a3f5eb78d5b711d4041e0031c71d367a0f611e5c28c001dc76bbb5c10a3d801b049c5b41d4d542489dcbe812b0a36a10874ceac714b34da0aff8c9bb4fcd9ccf
diff --git a/dev-python/signedjson/metadata.xml b/dev-python/signedjson/metadata.xml
new file mode 100644
index 000000000000..d52dc8df1afc
--- /dev/null
+++ b/dev-python/signedjson/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">signedjson</remote-id>
+		<remote-id type="github">matrix-org/python-signedjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/signedjson/signedjson-1.1.4.ebuild b/dev-python/signedjson/signedjson-1.1.4.ebuild
new file mode 100644
index 000000000000..ddefed8ba9e7
--- /dev/null
+++ b/dev-python/signedjson/signedjson-1.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signs JSON objects with ED25519 signatures."
+HOMEPAGE="
+	https://github.com/matrix-org/python-signedjson
+	https://pypi.python.org/pypi/signedjson
+"
+SRC_URI="https://github.com/matrix-org/python-signedjson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/python-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/canonicaljson[${PYTHON_USEDEP}]
+	dev-python/pynacl[${PYTHON_USEDEP}]
+	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_9)
+"
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 8552e8c6eaaa..aa62c9951cca 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,11 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
-DIST Sphinx-5.0.0.tar.gz 6726986 BLAKE2B 95f2b85c7de6d900922730c3e431259e2333b3fe27e25cbe35e9584ccf1ac3442ca0949018e64ca8481e60f2298b46f6a77523a7a67e6aafe7492b62ff97aa70 SHA512 6b58427aa8a4d9e159f5b84366ab2193df5a9e940c9cb11b440dabd2c32dcdbadbb7eddbd9f6f8c53e577bf7bfb7c11f979835b5df75139b5c5315f88794871f
-DIST Sphinx-5.0.1.tar.gz 6728011 BLAKE2B fe75d6bae6c035ee8ce24e3edb8ed8df9973835bdc935170775a7e80e1420bb0dee31976343dd0c3791508cc944f7b9ea44793569a94dc03756ab02d313e26d6 SHA512 6a850860fd7a320c49f2d406c511d1e7e2fc0e044911f98be3a07b1d519e79d57cd2d16c0042926255323625f186a26509772b425611fea85dfbeaae7e8e06c1
 DIST Sphinx-5.0.2.tar.gz 6729086 BLAKE2B a2cbf8efca673d15e364d0db74a8c5e2c0ff469f2a102317fb9bf23aac12c12ced2593e3a5e2dd0ee2bc114f2018356d382d601a3c7ff9b2943e38b59fe45db4 SHA512 d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
-EBUILD sphinx-5.0.0.ebuild 4439 BLAKE2B 096d95482be20107c06a5ab670def8c87d26b605584a1a92dab725bad1d89d30bee93b9edaf40995f4511a30e3af837adbfdf9f9a5769199bbe729f11d9f038c SHA512 cd625abbd6f2dd91c7232eb3e8869b6d8946ff92e622d2f80df39b61e8eb0212f287c305a31c5e493c9c9c8257780010696b720bfeee8f38ac4f59e35ef2a1cd
-EBUILD sphinx-5.0.1.ebuild 3896 BLAKE2B bab97af9df8eba09cfbc08e3a82fbdf1412e06fa11dab31ca828cc7ba97aa682316713f8c36b299809c2c073dde4c074c15c6aa8424df68de8300aa8d9b84f17 SHA512 30156ff177f74a4ad71a08726ad4a9a24ef4b28cd5a2d0abb9a9fe9a4d9002715f9a223afd002ea4c00f49ea0373e0706efd6a122e8a27c4467ad0ee53f8ef77
-EBUILD sphinx-5.0.2.ebuild 3898 BLAKE2B f1f2b0ae99aede0ec91e2fc13b32b0e024aaca69e2d93553af9b357b7ea80a626add54fd5355159dfba6034d530afb545675cfcfcdcec2386ece3011387ba048 SHA512 381bcda5554539bbef99845cc848f3fd6ac776a5fa1f5faa5bf2a05cded917cd483bc8c026eb798d2b09d79576f43e893c0c3dc4d19ebc35c755309386923377
+EBUILD sphinx-5.0.2.ebuild 3890 BLAKE2B 33c003fa290164243633c18e20fdfdf8c9d2b29860a96c51a5c15e66fdaf494d373c77c75f0e9625b2755d66024a1932d5eb79305b3beba703c95e36ff9bca04 SHA512 032c2a4866459b8b40d34ad2438012e683973c09989cc3fa53365ac057164895bb46ff000aa46263adefb64cdd526e4b0df2152bd4d9e859378d417cc8bf8c3e
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-5.0.0.ebuild b/dev-python/sphinx/sphinx-5.0.0.ebuild
deleted file mode 100644
index adceb91af590..000000000000
--- a/dev-python/sphinx/sphinx-5.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.0.1.ebuild b/dev-python/sphinx/sphinx-5.0.1.ebuild
deleted file mode 100644
index 64cbb666842a..000000000000
--- a/dev-python/sphinx/sphinx-5.0.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.0.2.ebuild b/dev-python/sphinx/sphinx-5.0.2.ebuild
index f9cabe05dfb9..c551896317c1 100644
--- a/dev-python/sphinx/sphinx-5.0.2.ebuild
+++ b/dev-python/sphinx/sphinx-5.0.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index ae3d537090f1..6f9523d729ce 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-2.3.1.gh.tar.gz 89715 BLAKE2B 567101be14bc759a995b5753ecf129a1e3fb466a16e4d84d55cf19223d8e3bbd439bf519376bd0dfad13b076fcd29aa3f4f7ab66dfa2525f300e7842b7aa2bc7 SHA512 e8831204f242b68a8aff29f3e66c78f38a8b09542d651754c557af7333e7e3d9fa85ac1dd048972cd1f7eadedee3017afd5b2d012b1473b261603e9990ee12af
+DIST spyder-kernels-2.3.2.gh.tar.gz 90754 BLAKE2B 1725ab6a72c31eab7befa1b86406e92eedbc19f7afe72d78c9713cf96a57dcfd950408d11c5e4c769b5f670dd021e047c047deff446d3d609913a3f7a8118640 SHA512 d63ee48e6934679b353dd5a5d42e5faaa4b9a3a7dab8f9e00e5e08526894af23e5dc6c78fc6ce190f181ede6fd32e72d9e1c9a8bc078234d4a7a1bb19923384d
 EBUILD spyder-kernels-2.3.1-r2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
+EBUILD spyder-kernels-2.3.2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild
new file mode 100644
index 000000000000..0745e08a1548
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/
+"
+SRC_URI="
+	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# we no longer package distributed
+	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+	# RuntimeError: There is no current event loop in thread 'MainThread'.
+	# https://bugs.gentoo.org/834893
+	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
+	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
+	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
+	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
+	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
+)
+
+python_prepare_all() {
+	# No additional test failures with ipython-8: 843251
+	sed -i -e "/ipython/s:,<8::" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 0d19fdf84d05..29e7292cece2 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,5 @@
 DIST tldextract-3.3.0.tar.gz 110388 BLAKE2B 4f60f35de9bf774b3cbf9a67e17a5724197521b1ff1ec072fe4487608165c265ba6de736140e8677eca47229fc68d6c634ba1013a5bee294e7e1990925703938 SHA512 530e8592c2813c297355cdea591a772fad3e4cdcfccf72844c49ad68ab1acd57e6050828f78fe3bbfb9d54d62f33c63fec70dfb81d9955abf971703f53daa326
+DIST tldextract-3.3.1.tar.gz 110819 BLAKE2B 18fda8d78783c3da7949fc9d019921dc4188686d932033dea8f393c0964adb935d104475836df188390c4dc5d0d67b4d5be45baf7f0dda1264fc4b8adf73be7d SHA512 ec1c8f326772cad04caecb65fc4b6c0bd168233ca59c14b4baf0d365420fda6c740febb8399bb8ead747f259bf81b513a7edef3b3e832576703d56ab8fda1bc1
 EBUILD tldextract-3.3.0.ebuild 802 BLAKE2B 6d7fa552d193ee908dfd772a52d520f48e321b22598a95e72528a38323807a7e8a843fc41c352ebfff7831fa5a47b89e8d4e93628efef1ce8da47eddff794551 SHA512 a8b488ddd8468259464c428c5468d83eae68dda9590994c494fe0a6ad0a8587d2724c86c937052e62c6df4dc87978f131d7f121c73f11d810d5e3fcaf0cd5466
+EBUILD tldextract-3.3.1.ebuild 803 BLAKE2B eeaaf04692b8635f433061c8128f0303d22a7ea5bd1590efa25cc30687a3cb5201a125721a7df6c9fdcf0747be59c03997f071777cd0f202c0a52f601cb45194 SHA512 8a9e3b6ad02cfe7fc7268a102e72c39d9b56e629ded9add43f300e81dbfcc8fe1c4ac2bf8bee9c65ff1ef2c19fb3ea21352ddde5c70e93f81195307acea4027b
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-3.3.1.ebuild b/dev-python/tldextract/tldextract-3.3.1.ebuild
new file mode 100644
index 000000000000..b6e706ea735f
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
+HOMEPAGE="https://pypi.org/project/tldextract/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 511b09d0cd66..d6ba118b7d83 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,5 @@
 DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
+DIST toolz-0.12.0.tar.gz 66264 BLAKE2B a68bd895a4d500baebae02dce389adabbebe3eaa103ed2753ebd42d84dba54d9ef0b1467738b6a2eed14af24e197a12ef6b6c6907bcf4633252256793e1eac5f SHA512 6c1376f978a1ab469a6fcca9a5ccaf8b8f1bdf92e4484ff0bad947d6727f390ed6571426070a81a0e123725269043ded28294e57921bde2bb9ff87b048a5405f
 EBUILD toolz-0.11.2-r1.ebuild 516 BLAKE2B 6edf754fc8464671be8cc7d9a11ad178ce4f96eb6679f026d51de8fe587b27a400dc7bf28d8a0f53b5bfe2f2d6defb1c16461896370a40a1933fa2289d68d09e SHA512 eec8fe965902bd8d44afcf13effbefb005aa9d2c7012663ef42464a98bacfebcf8ae2fb63cc6e2d3b55d15996bb1dacd141b50781e9f3b6456279e313eae08aa
+EBUILD toolz-0.12.0.ebuild 632 BLAKE2B 2f6da5d62f32c1f6392122d431ce062bfd0762f8f5e41410a9c8c2ea82a6eafb8d47a5cc5849857a60364da7f1fc28d37ee988bfc50ad2a83f98f8d3183ed044 SHA512 caeeb14faf76e24bc6f9f7b986639108b6d6ce72cbaec9cd6f6703aa5afd6fc3d2c506e3a62c0f84b8ef5baa3d74c88546d7b50e407f88238969b1b5c113879a
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.12.0.ebuild b/dev-python/toolz/toolz-0.12.0.ebuild
new file mode 100644
index 000000000000..85ec887510f1
--- /dev/null
+++ b/dev-python/toolz/toolz-0.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="
+	https://github.com/pytoolz/toolz/
+	https://pypi.org/project/toolz/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/unpaddedbase64/Manifest b/dev-python/unpaddedbase64/Manifest
new file mode 100644
index 000000000000..0d98428c8d35
--- /dev/null
+++ b/dev-python/unpaddedbase64/Manifest
@@ -0,0 +1,3 @@
+DIST unpaddedbase64-2.1.0.gh.tar.gz 5869 BLAKE2B c53dae277b5e69f6d905724d5b212050100286217fd236f9e1a6c344ff479d4c38ee9634a544b2e693522c04a9bbfdaeebbb2ac79904089d91e4d6c18b6995e8 SHA512 9c7c2dd6e52ffae2bf076ccf9e1e2ea9a53cbef083c23f640cc2f3f5c49ceee0c92c8abe0469e10d80b7c9e74d69b2b06111b1c4204b4cb1788ee3fffcea6e11
+EBUILD unpaddedbase64-2.1.0.ebuild 546 BLAKE2B d26fad580e0d736fa1f90516a95eb50a633a4e9feb33e55c3e6521c22b31b2cd048a30155f5faf1fd5e62975b8c399fd51054449f625ef86698e35ff6a6dbb20 SHA512 44f02fc712dd887a8f848619cd76d2d4c4b951c71bc236a7393854536118ec98699f7e91e26f9bf45aef07f234b47bd9845b0831ce937f2d75624a28e35d8950
+MISC metadata.xml 540 BLAKE2B 1898130f21204bc79295999a55a50813699ff59e2d3f42dd0cc325be2b6653e5dadc895b072055d8c98d245e6eb9f68570ac24b8002f22027c720d872a893683 SHA512 6026ff3cd1f74a7b4254cef463285dfcf5b79c2a7433fa699b2eab31ac02a340559a1c2297179fa48e5263d9f864a30dd195953890847b97bec483949c570a8a
diff --git a/dev-python/unpaddedbase64/metadata.xml b/dev-python/unpaddedbase64/metadata.xml
new file mode 100644
index 000000000000..9b1cf451b586
--- /dev/null
+++ b/dev-python/unpaddedbase64/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="pypi">unpaddedbase64</remote-id>
+		<remote-id type="github">matrix-org/python-unpaddedbase64</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
new file mode 100644
index 000000000000..d8e6ae6fb108
--- /dev/null
+++ b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Unpadded Base64"
+HOMEPAGE="
+	https://github.com/matrix-org/python-unpaddedbase64
+	https://pypi.python.org/pypi/unpaddedbase64
+"
+SRC_URI="https://github.com/matrix-org/python-unpaddedbase64/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/python-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index bfef58c70c82..f092006e7e29 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,3 @@
 DIST uranium-4.13.0.tar.gz 1072294 BLAKE2B 3d5110ec4fc6bbfbf085d1f2c177ae19305d7e3828cfe44f7e83aa07397224e3c4e5441f83684f49f21fc6579eb7d3e7fc176eae80c76c3b10354757c01ecc40 SHA512 bba41754670b42eb92826fe1c2380b76afb62d16158c07f960315dbd77c55932d29dff594d71aff8eafc2f58d1aac4a14b0f6fc36a0a352872077b97c0d7f555
 EBUILD uranium-4.13.0-r1.ebuild 2494 BLAKE2B 6207c59e07785d742a37a2591657a4d841734dee1994f0c34f287562a6f98ad743cb4e6d5e24909efc8f9929ccc6233f5f2abdc9c11579310f0df5637be9795a SHA512 319a5ee23354b8f5d05dce1bade9695ab0ec174c81fe946f86640e9dbea8546ccd36e602298fe5cc4ed6cdf6587af8e03d363df36db0476f401b95350946507e
-MISC metadata.xml 1209 BLAKE2B 00fe2e9f2183b7b5e3f3e59207077e56bbc9fc1f74a1634a9770ec558f0bf066502194f077b65814d99bed2758f4fa5986531815c1bd6cb4f307713c796ad2d2 SHA512 e6309b56239464c64c9ce52b7e483167b0812088b822ccb5ffe6f2d49b5cd1ee1e2ac115747dd53851de8267a0b97c020f38b4d051f40ccd44730ecc98f4cbf6
+MISC metadata.xml 977 BLAKE2B aac5518171650ed9efbc88d9c12b9f9de919ec14d206b510b64a5eee2fbe0d0f9e044c79667c0c7e1ae5ef9536bc0513a4424211aab537e649a04e7018a97203 SHA512 6d2a4d3932fcb095d350e13260c731c8df0ede066e72c0f3368a74e8d8ceb5ee9463bd0414445e844e45a4c8be51e2c68fa66cfe208ce3680fb4e2e47fce593d
diff --git a/dev-python/uranium/metadata.xml b/dev-python/uranium/metadata.xml
index 2fb160bf2743..5c50372d262c 100644
--- a/dev-python/uranium/metadata.xml
+++ b/dev-python/uranium/metadata.xml
@@ -9,10 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -21,10 +17,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e5c333505fa5..c69d0ba3211f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index d3884a043927..a612651e1c93 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,7 @@
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
 DIST hoe-3.23.1.gem 194048 BLAKE2B 907c2f2b62dd362f8c472f21d3fd998bd178de2a15fb9875ef36c61dcbf6b170253037d64f70b04b45a5f7e7dcf9e084122a85f694c6396767d541dccd5693f5 SHA512 c2199f93fe806a9639b319d01ae7bb6999ac203aa8bbabaf22b4c0c5b97f69dbd4e876bdfaaa0b0e8cda68dbd25dfa0e5aa91a599613237fc22de0e857c68c37
+DIST hoe-3.24.0.gem 194560 BLAKE2B 6f4259fcad82078ea4d56ee7f42027cb9561fc603e1a36634de3f11a48ebedd252ee4ddf5884e571ee0231f5dec20c6a7249d0fb6784bf531a017b033955e680 SHA512 f2048d1f5d9b3010267f2ffb67cbce2aee7ecf58871dd762e51a08035272cdc6b37aacb63aa0af6f62e6dfeb01a60afd53a25b394ff10322a8348320268adb76
 EBUILD hoe-3.21.0.ebuild 1473 BLAKE2B 4f5e446eea384bc7e4a7f97998dc62ff6f5fbd56f3b9cb938855d4015601a4202927e46b16c3961c55e85c4d2753fae6cbf452198b200eb2b0e994e7e58ba264 SHA512 c1c69b183dad00e7230a49a216dd537ca607104d5cda9994b72423545749ddcf6748e6b0e6a36f0e87313387fd0a4d238d8d1beb89a083180ce57bc619b0aad1
 EBUILD hoe-3.23.1.ebuild 1534 BLAKE2B 4a4eb378cde8593f6cbd36d911425c3afe7f6c33c1bbd52875085c9b20d8169f0b74b1fd3127cdadcb32fd98f80a145eb0566fce8ce91f9e6df459e46088a40d SHA512 a20b626a0d151ef8353441844913555c1a390604acffc5f43d0069f522a22f928086542d0295ee7eb9e0fba8ee7e60df9a593c97d5ca8fb7eabd074284539207
+EBUILD hoe-3.24.0.ebuild 1534 BLAKE2B 4a4eb378cde8593f6cbd36d911425c3afe7f6c33c1bbd52875085c9b20d8169f0b74b1fd3127cdadcb32fd98f80a145eb0566fce8ce91f9e6df459e46088a40d SHA512 a20b626a0d151ef8353441844913555c1a390604acffc5f43d0069f522a22f928086542d0295ee7eb9e0fba8ee7e60df9a593c97d5ca8fb7eabd074284539207
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/hoe/hoe-3.24.0.ebuild b/dev-ruby/hoe/hoe-3.24.0.ebuild
new file mode 100644
index 000000000000..df8feea963c7
--- /dev/null
+++ b/dev-ruby/hoe/hoe-3.24.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 26056153b940..6d087f492251 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,5 +1,4 @@
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-EBUILD redcloth-4.3.2-r1.ebuild 1503 BLAKE2B 9c347450a57a184e67388e4c29e661e13aac23060972dfa43a9894d52f1938cf2ae7395be21caf33f3507fb4e8ee639c3ffee3c2a5ae5c3e9106a64184d09090 SHA512 8628c0aa015983329502b2b71ea4325990b562feeaf2f8e62c7f6e015508380229f908dd8c6014be542af371557dc63008ef030e2c037e633701a4837146a6cb
 EBUILD redcloth-4.3.2-r4.ebuild 1377 BLAKE2B c55b6efb03a6fa8b32e6b3e96fa1c0fae21bf163cd35874c0f8e1c1a4921728a4a5dfd61ffa44b38a98448b143634892499608b0db9c4ee23eaa09e21806a72c SHA512 b8530e2feee76ec62fe1782f2dc4f9e73667831ad37c5d30f18e5d70a43ba5edf27943da32eb367f30321494c4d382a2fffbc22852e9a133f425da9dcfd908ef
 MISC metadata.xml 343 BLAKE2B bc8d08f10a63e9472843d4dacf05c70f08fdf9587b6811e062360185ad66f9d144f0f871369f6a4f049a51a292965b902a3ba346e649671a4a283cf93fbbaa7e SHA512 89848472f2bf75c4286766d4aa62799db98fc22aa2be9cd2c05453e0e6c1868fe61c46b7bc0e83ab97ec85f959826699eef36215c4fcd6186e70ee975ec878ac
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
deleted file mode 100644
index bea03847125b..000000000000
--- a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-PATCHES=( "${FILESDIR}/${P}-load-documents.patch" )
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-
-	# Export the VERBOSE variable to avoid remapping of stdout and
-	# stderr, and that breaks because of bad interactions between
-	# echoe, Ruby and Gentoo.
-	export VERBOSE=1
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm -f tasks/{release,rspec,rvm}.rake || die
-}
-
-each_ruby_compile() {
-	# We cannot run this manually easily, because Ragel re-generation
-	# is a mess
-	${RUBY} -S rake compile || die "rake compile failed"
-}
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index 076d8d83337e..dbe1a400568e 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,4 @@
-AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb
-DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
-EBUILD redis-4.1.4.ebuild 1243 BLAKE2B 0ecf01be3d4fed5e69d23bcbc4aa142141649f8a545b7b900fe0eea26480f431f4a9fad81ea028a9bf528ce2b6fe01b3fb661318c6da2d190eb913e9862aa01a SHA512 930a2c96ed342c158dd2b090bb2bede4cf79823ca10db3ec0ee3a7781daa4f7091cdad6662250896605a2bacada0610b75245a6cd7d0b153e159a035bfbc9f80
+AUX redis-4.7.1-local-redis-server.patch 1475 BLAKE2B 46a5703b463372ef30184a1108b3128672bcd2bb7c77b9b268ae336199d113ccdd439718ede4ec066f1659d262ad2404f2c01419efec08c214a2c045f68ac118 SHA512 6271610c96a006c26e2e1a4a7ea272ff3feac94f86538ee206e83ed8fde5082334b8c8a0decf584084a38b31551456ab80fd6b8ae1cc5ad3660e6a447f70878e
+DIST redis-rb-4.7.1.tar.gz 142130 BLAKE2B 12c9bdafe32e80e2c8f515a437f44a3673381ee6257bf4eb95395e7229134e54706a1c7eefa880397e3b2a10cce6c70856b30108f1c941fc9ee6307989ba4be1 SHA512 33aba308a501593b9d442f346d5654a734a889a45ee581092684b9aba5eccfd4efb790c8dcbb73a83e626b8b2da07d2a4535d698fd2d2696efb217ac522ccd89
+EBUILD redis-4.7.1.ebuild 1109 BLAKE2B 3091c263e18078f17253a7f43203c77ed368e455ed7145c2d69a4e062db07775fedb77162cb3671a9cfa0478eae1b7840569b9f0a0ecfb25343be79add53e8fc SHA512 94c9f0d9860f74951216b378a610d77484b9c3a435b50c2d0503ef787ac1a8c15954d1aecdfbb29b97b10a857f429220c6efdbc88a424e5bc99d6915f1297c18
 MISC metadata.xml 341 BLAKE2B 2a18679e5570f1b5ef6e1fd5d449a75872c223d2e228bba1ee6390d90136f2156f964e77380d722f71d0c2334dc17b490b9b45b452ae7ada2609dab0543e1591 SHA512 faea0064c473d0ef90303d9299d5ea9dd91fd7ce4be7e28a28bee9f5d8bf25d5a880f6cd3990c2c6c7d183a43aa1a26050e360fdd1ffcbc086bd81a45c51258f
diff --git a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
similarity index 84%
rename from dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
rename to dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
index b9db61a0a6a7..e220d62e35db 100644
--- a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
+++ b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
@@ -1,7 +1,9 @@
---- a/makefile	2019-06-29 08:02:02.519804948 +0200
-+++ b/makefile	2019-06-29 08:03:43.125559643 +0200
+diff --git a/makefile b/makefile
+index c803066..d50ee93 100644
+--- a/makefile
++++ b/makefile
 @@ -1,16 +1,15 @@
- REDIS_BRANCH       ?= 5.0
+ REDIS_BRANCH       ?= 6.2
 -TMP                := tmp
  BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
  TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
@@ -20,10 +22,10 @@
 -SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
 +SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
 +SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
+ HA_GROUP_NAME      := master1
  SENTINEL_PORTS     := 6400 6401 6402
  SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
- CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
-@@ -43,11 +43,11 @@
+@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
  ${TMP}:
  	@mkdir -p $@
  
@@ -32,7 +34,7 @@
 +#${BINARY}: ${TMP}
 +#	@bin/build ${REDIS_BRANCH} $<
  
- test: 
+ test:
 -	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 +	@env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
  
diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.7.1.ebuild
similarity index 63%
rename from dev-ruby/redis/redis-4.1.4.ebuild
rename to dev-ruby/redis/redis-4.7.1.ebuild
index 18843a889001..723a96dd0e6e 100644
--- a/dev-ruby/redis/redis-4.1.4.ebuild
+++ b/dev-ruby/redis/redis-4.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 MY_P="redis-rb-${PV}"
 
@@ -24,20 +24,18 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm64"
 IUSE="doc test"
 
-DEPEND="test? ( =dev-db/redis-5* )"
+DEPEND="test? ( <dev-db/redis-7 )"
 
 RUBY_S="${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7.1-local-redis-server.patch" )
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? (
+	dev-ruby/minitest
+	dev-ruby/mocha
+)"
 
 all_ruby_prepare() {
-	# call me impatient, but this way we don't need netcat
-	sed -i \
-		-e '/test_subscribe_past_a_timeout/,+18d' \
-		test/publish_subscribe_test.rb || die "sed failed"
-
 	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
@@ -46,7 +44,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true VERBOSE=true emake -j1 all
 	einfo "Wait 5 seconds for servers to stop"
 	sleep 5
 }
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 288d560dd847..c88532e50d4f 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index aab78f1c08aa..e912b68271fc 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,4 +1,6 @@
 AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
+DIST BWidget-1.9.15.zip 329390 BLAKE2B 011bc3e303082af8ec4aaf1bfa3812cec0e0c91dac41db867d5ebd5883949795d5877a53050be31823a218fdbc5113df8c848378af133ecb26dc07f5e8360b1c SHA512 cc3c46a112e902158c3f010941efcd51b42adae5b989511b325c619bffe79c3a11d74b044619e1ed9ef4b77abf18f7a2e8dfbd3fe46e1d26a1b61a02c3a3096c
 DIST bwidget-1.9.14.tar.gz 261654 BLAKE2B 2c0e8ed33624f6304e775da3be02975aced85c8eeb8ca7fd736858a9323f7bd6aad96bb3697db1c9c571d5dc72ff21d3c161d4f2a8ada83f9ec615391c0f1890 SHA512 7db9c69ae423e97356ff3e54ffc77a450fb967907b32356f343aa4321faceb3e807e63babb2edf0e2c6ab086af570dbd6a02a85e4ca2c1f020ae4df78c8f0fe8
 EBUILD bwidget-1.9.14.ebuild 786 BLAKE2B a44e9a3a1bcd2030d8e4b838f4c60e92934f77250530cea445241328ba148637136f9d1b4dcd39ac30a68cc61cb398497f0914f100d33f56ab4bcc4eaa2b16c7 SHA512 f628ab4387c97981c0aea500c7a52219a0ee3e172720079b53912285adbda1aad48b2a09d6a4993f771042f8dac741db3c6a4e99cf36245b18b21ce44efc0a63
+EBUILD bwidget-1.9.15.ebuild 817 BLAKE2B c16dd72f905ae2d595c5ccbc9babbb1cd15cd9f27bce65582c46944772c800adc7a1b8d1d0150df7a2ecef0caf6447e5a5615fd1c2cd502b3c32f73f95a7cef3 SHA512 1473db75a698fdbf540fc9df7261b736a788eaa93d94e5b7bfdca04f2895624f69589861274628bcb2af982b74ddca719b63fc9c8b087540bf7505933d322a3b
 MISC metadata.xml 330 BLAKE2B 804934011048a0886fde1667b6caceccf3c937ddfa56eaec506e3f1f0e6c275ffc2bc07c8ca4e3fec49acb39814d437bfa820bbd04b8e1111b4e1004a1678e40 SHA512 c662b10581abf645c410376a8618e19e7d7d3fe9fa54260b538105760832779bcb38c83518bedcd475d60c14c4a98c5e3e4a1bd00fc8497f5125056add78071c
diff --git a/dev-tcltk/bwidget/bwidget-1.9.15.ebuild b/dev-tcltk/bwidget/bwidget-1.9.15.ebuild
new file mode 100644
index 000000000000..35390613170f
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit virtualx
+
+MY_PN=${PN/bw/BW}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-level widget set for Tcl/Tk"
+HOMEPAGE="http://tcllib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${MY_P}.zip"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-lang/tk:0"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
+
+src_test() {
+	TCLLIBPATH=${S} virtx tclsh tests/entry.test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *.tcl
+	doins -r images lang
+
+	dodoc -r demo
+	dodoc ChangeLog README.txt
+
+	docinto html
+	use doc && dodoc -r BWman/*
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 01bc9247df3d..e9f00f4aa0c1 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 5148fecda258..26f0aac4a517 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -4,6 +4,7 @@ AUX Tensile-4.3.0-gfx1031.patch 7037 BLAKE2B ea2e5dec9d5f6749a78cae4d1659a08b712
 AUX Tensile-4.3.0-hsaco-compile-specified-arch.patch 3859 BLAKE2B 4590978cff0fdb0501ba2405615775cb3f8900ce164c3d57cc59dfe82e1adc25376b6463855a045f5e0652cc985b0015566b95ff28327c59f2db875a84cb49b3 SHA512 57520f1d46f46c7cfd5b8c3ae307da07695c19479b687ce994ad9fba2e755ed7c776c3d8bee8e0642c7613a5d53d8469f329b1eb07563c13d2f7bda8b3d36687
 AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf
 AUX Tensile-4.3.0-use-ninja.patch 957 BLAKE2B cb919b224aaeb3b9d65a755ff0688aa823b70361d2ee940d62f33828c118a60c88cd0f108b6e34b22097d9c4c5122a4db2808332a97cd6e7685a4447570b7552 SHA512 3d206a093e870fc95f0ed42e08691144589112d4581f73ba1c4c74ed9bdad0812ec4f67a6076a8a3ac9ab89c61c70f1baaedb774e0908177473be2d206858bf4
+AUX Tensile-5.0.2-adjust-parallel.patch 2936 BLAKE2B faca0234d615e4451b83b53a23147eb441e7929a3ef7542bef3ac5d0a383a6d1aa966373a012cc40bcbd1137a16a80a9c88b4d5459552b6b04c4819cb325e8d9 SHA512 d32f358133e0727b9ea66300f680451222190c0b7c9d91a9e0364fb2589b0ae12d69facb5872a81bd36a770ad649a22120649e6d3550b02bc6365706392caf57
 AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e776599b384875161233d4a010a53f11a5764fd7a5b4c50ded1762737e9fbe7923b64e9353ee4590fd1b6b9b03ac621af35c9b SHA512 5913e7fc42bc5b43e1dcca531e4ef88b524325b497601171a9844013906c2ffc87469a4c55037c721ace5757c6aaf4d8bf8ca683f659f9d8988555c90425802a
 AUX Tensile-5.0.2-gentoopath.patch 3410 BLAKE2B bbf2c406bbcf2c34efd04667788719f6f10aebda3f9d9096e6798c1a8924768df4fed30223e2f4675af88c41841d148e43e3cd63edc7523dab4618ae245b0339 SHA512 c7b99eab1f0c979f54fcac3b2dcb4a2094b9a536bb392fcf4fb62050b1dc6e61f5280d3d1c7e3ed21617ebe693a17eb2bb7535a93f700123fe6aa6f28f256514
 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec
@@ -12,5 +13,5 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
 EBUILD Tensile-4.3.0-r1.ebuild 2764 BLAKE2B e24ddb516d8dfd9e5e691f567f5b97b279e518b38be49a2cc69e8eae100d4d2ce7dc1432247c0bd5c94656ff1a7faf88a8e8f2e8df3dbbbc491eb4323cc20706 SHA512 79859e7dd5647bc4c1eb766faa9b3116994ed74aeb900caaf1b524a1216dcadd8d0c608d097a0c4c1d51b3117b75ccf7a061b7624cad6390fd5ce37494d67987
-EBUILD Tensile-5.0.2.ebuild 2588 BLAKE2B 6c96777b8e08bf2cc70ec1d4bc77a97ea311dd3612d21ae3c8ea364d14287e982f0d2efe0c41b14e1108f64842c56f7ea202cddbb89cceaa57a8990d866ca6cb SHA512 606b503214c13747877380b6b91f80e780d83e9ade7ae983a4e350bf485b7bb5f90deaf9bc2844b4f94afb8c5d155103c2147ac402a0503edbafa0cbbf4ac11d
+EBUILD Tensile-5.0.2-r1.ebuild 2640 BLAKE2B a09e82c0d91aebdc308c58a5e1b09a6cbc998a6cb67dde419949532a39c915396d46c4e87d824ed8c8bc735c31c6cad9b9bc7a3aee96063203f8364f50d1c686 SHA512 0218b8b1276ab0f9038a02d0d0f94c169dd8da9a2f694ac097bb894298b04bf7e5fc87b66d7761cacc0415980dbca4f5c3a3f38fb044db4433ee071e4a49c64d
 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
diff --git a/dev-util/Tensile/Tensile-5.0.2.ebuild b/dev-util/Tensile/Tensile-5.0.2-r1.ebuild
similarity index 98%
rename from dev-util/Tensile/Tensile-5.0.2.ebuild
rename to dev-util/Tensile/Tensile-5.0.2-r1.ebuild
index c9240e233281..5bb9a3f21927 100644
--- a/dev-util/Tensile/Tensile-5.0.2.ebuild
+++ b/dev-util/Tensile/Tensile-5.0.2-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
 		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
 		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
 		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+		  "${FILESDIR}"/${PN}-5.0.2-adjust-parallel.patch
 		  "${WORKDIR}"/${PN}-5.0.2-PR1419.patch
 	  )
 
diff --git a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
new file mode 100644
index 000000000000..b96429232c78
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
@@ -0,0 +1,65 @@
+From 25b1621549f9b120462988913e657684645be79d Mon Sep 17 00:00:00 2001
+From: Lee Ringham <lringham@amd.com>
+Date: Tue, 2 Nov 2021 14:43:07 -0600
+Subject: [PATCH] Added better control of parallelism to control memory usage
+
+---
+ Tensile/Source/TensileCreateLibrary.cmake | 7 +++++--
+ Tensile/cmake/TensileConfig.cmake         | 5 +++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Tensile/Source/TensileCreateLibrary.cmake b/Tensile/Source/TensileCreateLibrary.cmake
+index 1dbacf41df..996f365bcf 100644
+--- a/Tensile/Source/TensileCreateLibrary.cmake
++++ b/Tensile/Source/TensileCreateLibrary.cmake
+@@ -33,7 +33,8 @@ function(TensileCreateLibraryCmake
+     Tensile_LIBRARY_FORMAT
+     Tensile_MERGE_FILES
+     Tensile_SHORT_FILE_NAMES
+-    Tensile_LIBRARY_PRINT_DEBUG )
++    Tensile_LIBRARY_PRINT_DEBUG
++    Tensile_CPU_THREADS )
+ 
+ # make Tensile_PACKAGE_LIBRARY and optional parameter
+ # to avoid breaking applications which us this
+@@ -51,6 +52,7 @@ function(TensileCreateLibraryCmake
+   message(STATUS "Tensile_COMPILER            from TensileCreateLibraryCmake : ${Tensile_COMPILER}")
+   message(STATUS "Tensile_ARCHITECTURE        from TensileCreateLibraryCmake : ${Tensile_ARCHITECTURE}")
+   message(STATUS "Tensile_LIBRARY_FORMAT      from TensileCreateLibraryCmake : ${Tensile_LIBRARY_FORMAT}")
++  message(STATUS "Tensile_CPU_THREADS         from TensileCreateLibraryCmake : ${Tensile_CPU_THREADS}")
+ 
+   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/TensileCreateLibrary)
+   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/Tensile)
+@@ -89,7 +91,8 @@ function(TensileCreateLibraryCmake
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--code-object-version=${Tensile_CODE_OBJECT_VERSION}")
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--cxx-compiler=${Tensile_COMPILER}")
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--library-format=${Tensile_LIBRARY_FORMAT}")
+-
++  set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--jobs=${Tensile_CPU_THREADS}")
++  
+   # TensileLibraryWriter positional arguments
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND}
+     ${Tensile_LOGIC_PATH}
+diff --git a/Tensile/cmake/TensileConfig.cmake b/Tensile/cmake/TensileConfig.cmake
+index 0ac8517c2c..fa8cb96305 100644
+--- a/Tensile/cmake/TensileConfig.cmake
++++ b/Tensile/cmake/TensileConfig.cmake
+@@ -112,6 +112,7 @@ function(TensileCreateLibraryFiles
+        LIBRARY_FORMAT
+        TENSILE_ROOT
+        VAR_PREFIX
++       CPU_THREADS
+        )
+ 
+   # Multi value settings
+@@ -184,6 +185,10 @@ function(TensileCreateLibraryFiles
+     set(Options ${Options} "--cmake-cxx-compiler=${Tensile_COMPILER_PATH}")
+   endif()
+ 
++  if(Tensile_CPU_THREADS)
++    set(Options ${Options} "--jobs=${Tensile_CPU_THREADS}")
++  endif()
++
+   if(Tensile_LIBRARY_FORMAT)
+     set(Options ${Options} "--library-format=${Tensile_LIBRARY_FORMAT}")
+     if(Tensile_LIBRARY_FORMAT MATCHES "yaml")
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 32ba7437f67f..86f48068ccf2 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -4,6 +4,6 @@ AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
 EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
-EBUILD buildbot-worker-3.5.0-r1.ebuild 4821 BLAKE2B fd63774649fdeafbb3f6f007d91cc1ded300455b2bbc73bbcf8f06af973528a43d77703170b23595c0dbd4bf6b02eb584bee023e26feebf611f4a5c68c8b6794 SHA512 1859408413d58f7b9b79f2c19c83b4244c19906b58650bc3b22087d32b81b97c8f972acea737db855cedca0f8f17071bdfff722cdd95dba00dfab983f5173ef9
+EBUILD buildbot-worker-3.5.0-r1.ebuild 4820 BLAKE2B d56eb4bda74894de2a6130c5c87db55242e686f4ecc54d718a2c51f24500a61af92bbdf4e0c35b146f766ddcf6f065397158783d9da0ca4f493ab48fbd2e831c SHA512 33344be29c8aed20cc78a82563959d3881de5a3d1bc102018dc9539c39539cf3854cc2182d2534a4c671179ea54d27f179270c1708efdb97a454c125fa3e6683
 EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B 624265dba845045056b7c7b6a58fe070141ea043e8e0b713650e83bf6d1e3ce78389001f831990843df149f2cfab0c02128ab4494310ffea19fadae3560dc4c5 SHA512 680b8c0f51a9a02f8f57dc48af1928084519b5d14a319f0090b0cbe9d7b40a5eb730e4e46ae21ccddb8f1e412450cb09c765cd9689b8bc31f178663701bd4683
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
index 9da9100eb30d..2a3f7714573d 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index e4830d0b94e9..2228c4b5c3d4 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,5 @@
 DIST cppcheck-2.6.3.tar.gz 3880340 BLAKE2B ef83538a0aa867dd0c0bd6165b41921335256ed0372a4990ad85151ab5e87a79bde7958be43887f07a4bbf372b9992339b75ddeae7ed8ea767b83c028dfc56db SHA512 e59b4b4659c2b4fa2c16dcb548f7ee3027555dddc289ef8b54fe186af0396b6f7caa23d91bf1142ece62908b56fe9f5ba013191817322815681994093310fb37
+DIST cppcheck-2.8.1.tar.gz 3921391 BLAKE2B d61c4a8a3e88441f0a65090eddacaa34bda91ba50ce92e79c122525524368ade49d24f13f343a5a856a3014e904495e87db2d774146e871af1738d55f1a52728 SHA512 ff5a9955498101a2d061a431d0f8ed42267627b3cd029302871ee781a0e4039aa531dd47c2d44d1f3952b5e5bd3b65c9b32a10a9b1922ef466f440f8c4417e28
 EBUILD cppcheck-2.6.3.ebuild 2001 BLAKE2B 6229fe97e051df083a748c36d2bc606060763d9a678008c87ebcb523acc24d76a822d14e2eee7dc81d9d6e1cb10940f6a684be8fec93b01f81e49a1dcf898763 SHA512 6203a4611ce362e6e115f97c19865a24d0bc9e019e739bd01fb211b4b7457ac6a0720ff5d2b28a4accf2297767659b80e5f0d617551baea81a0ba730b6ef8869
+EBUILD cppcheck-2.8.1.ebuild 1949 BLAKE2B 7ddf762a66c157345bcf4c78bacde9544e6de357591efceb4a47b505c19dbe54b43a3b11bd7d8e0f0d7d38773c6ede9af580c64e5e2541d4c3643c133e7baa0d SHA512 5c3da10d069a6ac582ea92b6b5a37f651e8c3ee961969d85ad0d79608b859e6e6238c295c42d920a0ba25d69fd8bbfd5ada9099a6855a38ad1ae5d9fe0d7496e
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-2.8.1.ebuild b/dev-util/cppcheck/cppcheck-2.8.1.ebuild
new file mode 100644
index 000000000000..03159a548722
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.8.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	htmlreport? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		htmlreport? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_RULES="$(usex pcre)"
+		-DBUILD_GUI="$(usex qt5)"
+		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
+		-DENABLE_OSS_FUZZ=OFF
+		-DUSE_BUNDLED_TINYXML2=OFF
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	# TODO: Needs some hackery to find the right binary
+	#if use htmlreport ; then
+	#	distutils-r1_src_test
+	#fi
+}
+
+python_test() {
+	pushd htmlreport || die
+	eunittest
+	popd || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+
+	if use qt5 ; then
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_install
+		popd || die
+	fi
+
+	dodoc -r tools/triage
+}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index a85e685cf06e..1cbe026b76a3 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -10,6 +10,7 @@ AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306
 AUX hip-4.3.0-hip_vector_types.patch 304 BLAKE2B 2821fb3bc7aa093a2f17fbb8baff8c5d68080f61a8636163d0c69463390f0ff553a0b67aa0a5879edbfd54a6afdae81325a8eaf58fb89cb6168cf6ccc5cc9208 SHA512 6d32cc886229d94b18b9779f30e81bb2e9cf51bd47385dc692ae49dd308de16e229a2fc560e5c40dad15f1c9c75038f13960754e0dbc57b3f281e5dfa6701f6c
 AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e
 AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a
+AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808
 AUX hip-5.0.2-set-build-id.patch 741 BLAKE2B 9d4668ab770fd1ebc93a19a3ddc2916e8feb69a95e54ceb5955c4a162733b8899d43f906c86b0b994add22ab46969ff18aad03035e6285a6492bc9c1405bce38 SHA512 714b2f8e791f0e30a7af567e430e2bba38473725e0d96e42de0c97a2ba939fd83b2f233eebf03cb8a6a82d10c46cfa5ea869af97f35c02da38924250a19e660a
 AUX hipvars-5.0.2.pm 590 BLAKE2B b67de8f86bc53d9fbcd50a9cfa9759feb0145f3b3e40360cc322676411e038ff21b8f81265ba27d099e51c3dc55230f87c477cbadfba2b48c08978216f2fbd81 SHA512 0becd625e6f34d687338e25ca4697e68a735a1df60a4c2c53f577e7999a34bc07041f513632f9534aa4b35da2cf50b02c96187f69fd183bff893343257aa85b9
 AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6
@@ -32,5 +33,5 @@ EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411
 EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
 EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
-EBUILD hip-5.0.2-r2.ebuild 4516 BLAKE2B 4d49a096527c27bd77365022a7dca407e6a4a10c6f04b294fd96c7910fd41aa10e3c14715ad5630b2f975a3622402449b8d7bf848eaeca17b54bdc221bf8b3d7 SHA512 0f2dba482017db043c56d25bbbafc9af1f58fc1d63cfcda9d8fce606699ba191b8d8f37f514e94130d1ee4846cac0d4fe86c089619d0d8a4e4f60fefb7affa8a
+EBUILD hip-5.0.2-r2.ebuild 4885 BLAKE2B a5b5c0cd40d1ae31d15ba4d774bfc6ce744b06025b08114976b6aa24758f5880eadf0cdd0b483d80469f6afd953beca56bf5dd6e8c79af111bbbe490baa876bb SHA512 00708d55c02c65cba95b009e3e14006901f92ea1ba8a08a32c25996e04613f4d6237c3b9ba0b1e2c237ad8269282fad39e17ef67b2319fb64bbe6ae9654f5748
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch b/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch
new file mode 100644
index 000000000000..81d1bc3b8552
--- /dev/null
+++ b/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch
@@ -0,0 +1,18 @@
+This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which
+causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm`
+Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820
+===================================================================
+--- HIP-rocm-5.1.3.orig/bin/hipcc.pl
++++ HIP-rocm-5.1.3/bin/hipcc.pl
+@@ -703,9 +703,9 @@ if ($HIP_PLATFORM eq "amd") {
+ 
+     if (not $isWindows  and not $compileOnly) {
+       if ($linkType eq 0) {
+-        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
++        $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
+       } else {
+-        $toolArgs = " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 " . ${toolArgs};
++        $toolArgs = " -Wl,--enable-new-dtags -lamdhip64 " . ${toolArgs};
+       }
+       # To support __fp16 and _Float16, explicitly link with compiler-rt
+       $HIP_CLANG_BUILTIN_LIB="/opt/gentoo/opt/gentoo/usr/lib/llvm/14/bin/../../../../lib/clang/14.0.6/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r2.ebuild
index 223386227084..fd069acfe4b4 100644
--- a/dev-util/hip/hip-5.0.2-r2.ebuild
+++ b/dev-util/hip/hip-5.0.2-r2.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake prefix
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake prefix python-any-r1
 
 DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
@@ -29,6 +32,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	dev-perl/URI-Encode
 	dev-libs/roct-thunk-interface:${SLOT}"
+BDEPEND="profile? ( $(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	') )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1-DisableTest.patch"
@@ -38,6 +45,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 )
 
+python_check_deps() {
+	if use profile; then
+		has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+	fi
+}
+
 S="${WORKDIR}/hipamd-rocm-${PV}"
 HIP_S="${WORKDIR}"/HIP-rocm-${PV}
 OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}
@@ -65,11 +78,13 @@ src_prepare() {
 	sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
 
 	cd ${HIP_S} || die
+	eapply "${FILESDIR}/${PN}-5.0.2-correct-ldflag.patch"
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
 	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
 		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
 		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \
 		-e "/rpath/s,--rpath=[^ ]*,," \
 		-i bin/hipcc.pl || die
 
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 91758c217a9b..d9ddc8af772c 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -6,7 +6,6 @@ DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54
 DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
-DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
 DIST async-io-1.7.0.crate 30669 BLAKE2B 1efc8a576b44b7853de5bcb2e4de7e031fab805cdd5d9c19a6716b9cac629992f59edb0f340cf247edbb62ce028767e2ca0dc5b2d4414aa86d6048a58e4268fa SHA512 aacb634f225b674cd79ea1e152ef0539f789b698768804ee7f4fd261321cf73ce55cd9028b062acc5ec82d29a072d15da408e14071f78ecc27f2ebe746e08074
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
@@ -19,7 +18,6 @@ DIST block-modes-0.7.0.crate 13464 BLAKE2B 70b4b199607925e338b22e04d48fffa459194
 DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
-DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
@@ -27,16 +25,12 @@ DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST cab-0.4.0.crate 25844 BLAKE2B 335f98874b9bf375fa8119b37acfe4d796ff13d149550f90ab8b94c330acc6a46948ec738708f4b6d3005352188e291e9d948326cb555be9e7044da690be8ae0 SHA512 a8c2f2a17b9ac0003690ab04568f7c86f87cfe393b40c7aa727947e5994c30e788b070cebc569aa298c6aac55ebf3b33c67b40b2ca47f95dbce0d8c4d6ae1afd
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
-DIST camino-1.0.8.crate 29300 BLAKE2B d4395b29d0b449ac3d7fc55f6cd112bfe380883087af2a686ac264c1c6dd58ce809b7eebe4c4cac053faadb0adcbe76eb1916ff3fba9f6cb65c7e330abdaa807 SHA512 81b70ee09ea788e0093a86ede0733c8f487d22db05bf2c6e81914e19ece81378aafdad7b6cd12ae6d8dbc3c5ab65880fffaa58a02465e0772f4b79eef9f51973
 DIST camino-1.0.9.crate 29357 BLAKE2B 7d855e08bed677242235197765a9f1f82e2743a0c439fa7ce4febc3b4595a5f9f66b23469d6cd610f4caf4a7bd1dbb1db4a7b6211ce43f08b4fb85a131e69d6d SHA512 5aca5f7a0639c97f5d5898fbbff9fa7ace9603047596941c62c611abb125525cbe5a4672057f4bbaecd7e34d907191ec5800415fba6aa0e6de9f52faee6f5363
 DIST cargo-options-0.1.4.crate 5025 BLAKE2B 270254b16d7d05cd03781ed17fc79f49f6e11a749d8db0b9ac50eb5a214fedd0c501a1bc075e1020ab48ad59b7ae8217a94cba36954bdf9eeb4cd81f9bfebd84 SHA512 a259e849edb121b4b1bd14e6e6ce5ce88643d6917c2d017c215a162a75445ea50a39682f36043625b29e073ac2f87dac2f46e37d040f7b89546b7a79bf6ae197
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
-DIST cargo-xwin-0.8.5.crate 25263 BLAKE2B b2a7574009838ce255f807cf8e568bb3cc7a78906c21b57f3698c74829191da8e09afc39a7ab824a5036569a6c1b321105a56ac3c6da63034e0621b1274a6549 SHA512 23195a622e3de5ccc6a06d2e72b80b519b3d9c302b7c652da150cbfd3c382b5129ec55892e12a60f3dfa6dd089eb74933efbe539bd4becdaad0c613f10ea5880
 DIST cargo-xwin-0.8.7.crate 25282 BLAKE2B f38bcdcec890cbeb3a7f1d73bdcdfcc0e3c497adea64926899b5aac075687ad36f52a29983e6d580a28bd0fd4ff9e14f2b88eaa0efb5df7b04db0f74f952ea98 SHA512 8c86564c8f88ee7238d28c2c3dd680a301e6fba65bfccd11364b0d603a5446d4e850048cbed475912fb4be3e4c677f8cadc6201d0a6a6541e8034873fb657702
-DIST cargo-zigbuild-0.8.7.crate 24298 BLAKE2B 6494498df507125456b9dca7688710404ab92f88c9b5ec5caec072fdb65ec22216f2244d995a3509a9b839f247b1c062df42ef378c8161ead7dce99da0cda565 SHA512 0e911033c425327bad4115ba4b7cf26f8f31f7ceba82f08d382075df16575a49e01b0cdaddbcf3c21e4e9dfc99ef9dba1cb8cfa5f462090bfa1af27f12bc5e38
 DIST cargo-zigbuild-0.9.0.crate 24926 BLAKE2B 91b2bfe9a59f1749da54ec73602af29420fc4dfd885c845463a08b493c724261e241b3f5006e2790b45a1a0297dd8a2db33111a60033280c71a34700b135ae77 SHA512 8eeff655568676a88cf3b058131511d1b58d7967d75dccefb0464633df1e178dc15e6e8fde20935d13e899a86815bcace3acdce2b3e85533804a29905be1d777
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
-DIST cbindgen-0.23.0.crate 188128 BLAKE2B cca6830ad99538e4e6697ab5fe6b6d36c96efbb33a9e971cf54923f0da327bdedbcae73d388fe522bf0e090b9b90041d6e32f5b083402590ba3de858bcdc6d10 SHA512 d7218e55526abfb226df524e634a72060de752eafe5b7f5c60bb746e2c4b105040455cfa16859e6b231c07cdf0256bbd608fe1afbec35fabe2f961927c19d04c
 DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfb-0.7.0.crate 62356 BLAKE2B 108d4a20d436b84963f972335988dda39949d72c8f096177eb88bcb929f0873c3ec8346bf8e606913799ffd0882901f8721b753714ca49ad307a1ee788fbe0b9 SHA512 f1c3dec790377bac4cd0ba1d017a0cab951395ec6e1314bbacbe44e61b3fccd58ca97f81c5f284552561edb69023a4e8b79bcf5aa1f6b3aad1bc677a34ffcb4f
@@ -45,15 +39,10 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
-DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
 DIST clap-3.2.4.crate 208372 BLAKE2B 5cbf38ab3a7022ad02efeb535675a6813bc0cc81e966be0968d50a044053dc6436eab105d45f45df205d903592d6ede4cb49528d05233c2b6d01ebb4310e518a SHA512 88998d5121a558ceefed5ed70a53f7760cc8f017d2f0c8c26c42e467ba1765d75f036600c4d764f8161c50744768bb3d9d21df6836deac043e5b5d61d516eeb0
-DIST clap_complete-3.1.4.crate 31223 BLAKE2B ee08809da96889594fcd7f85a63ef9c4ba9bfae3feb5b7b7c491c39712b2b1d2e98e734ed4b138f919535ddcfb20cc093602cc1587ec58d97a62fe008e86714a SHA512 3a76e4e94090c8fceebdaed4e6674ab8af2e5282c72e19643998e55dcc8e07298153baf67b4bfa430ef814c92a3c3b8513d2c857eaddc7a586693bd3a9d2b1ec
 DIST clap_complete-3.2.1.crate 31543 BLAKE2B 3e4e83f52d056736851bf8db7376943f0f43955d8e7d32e66f7c1e2b8ee1cc7ec24740c1c1bc7aba2ac3159aba70a3ea07bb154bf551d2f08b1463521b2bedc4 SHA512 75a42ce30a5661a75763373381477862157161b01c0972c80c01d6610f3fd9f20ac167aa55921557e574d2d895b614ba5c780780562b46aaa31fdb487ac11127
-DIST clap_complete_fig-3.1.5.crate 9919 BLAKE2B 7f817bd2a2046c9d2dd3d38c5202a6334cd10b7656e94d5e217f8e3b66c5d1d0a0fb96e6ab58c39cf0165f533b43aa54821b4bbd77bb8a8b36e8ab1fa2ad9e18 SHA512 93ff5ef5e21e5575ac2cef2e33ee3d005b17d5d6849493b282f956ae65dd8f7245fbcfdda0a76bc10a0ab038b89a136833771761d4e64715fa4f68e8cdf568a0
 DIST clap_complete_fig-3.2.1.crate 10106 BLAKE2B 74a9d4c3027afbdd61294e7ded25317b6b4b1d78a12b1f16d03ef2860c262c6dcf5f65670f752fa490eefd9da1d0b934c1989120f6e4bdd7cb966016028098d7 SHA512 cd2aa876ef54de086dd68f1c389a0e2f2ef3b8cc7b6ad56e231ac34e87936eec906ac1b6ca552f9a7bda272084ce6468c543e7d4359bab5b3e3bf7e84ef268fb
-DIST clap_derive-3.1.18.crate 25521 BLAKE2B 4c46e0793bc945d9ebfd7ba104264a8cd7c92782c24a9116a8cbf92696476adbe6d5059ee0c220bf71c297bd66f976b91ab95ca75d4ba56714a2824ca7e1af7b SHA512 9bf92e45de15bdfe1ca9a1363f1d243b8df1e5e7d957d6240fa351387b362ef91dc9acffea7256c2161ae8472e35ee2cd678c0bee1f9a27771ae9f4f3f71b351
 DIST clap_derive-3.2.4.crate 27646 BLAKE2B 3ca6cd0b3b5d35bf3eba6aef4235dfb94c977fee1a5f11506272432b85917193b688de97daa134fe2e85c7a5c736dd67a0f09a17343dea3a4796c55ddc97133f SHA512 f2c2fed1656ac7a81b86e2cf8b4925864476b687b935b1c2b69bec9466403d4f80d98f19cb16cfafdd98ea0289a1256f4b500c954085bd8be584f4f24804a5b1
-DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
 DIST clap_lex-0.2.2.crate 9657 BLAKE2B 74f6ed5c674664f0b81eb6d61427c0bd4bb2a2e7159aa00c2839a32e360f41fdf388c1455b52658a97900bb1b8d729bdd4f00cc5313e3115234e65a0704ed3fd SHA512 ea1d37bfb29412409db06c1991413dfbb83e393d74c3cdeca80ff317a423f41891510f6ed471f7cb7dd97288393726b14645287ae59cdf7be41f3a1bc9a3991e
 DIST cli-table-0.4.7.crate 13195 BLAKE2B 498e7434639a4bf21f4b793def59e2f045f8353eb2e12ccbf8778a0a92196ed589ddd94e696a000fa7a2bd50470624f2972eb613cba538956e50c6ecaebc1b53 SHA512 2696d3204107f2bf104312fa1e13a92638fe9ea1894263cf707cfe3891ec083499b1b0594d8571169ca242abd6a41396a88ca41dae8a3ce7f04365292158a87b
 DIST combine-4.6.4.crate 132144 BLAKE2B 9d6b513adc63b49888dc33444e3db2c0c4b950a6c4e30ff17e0bbf4b3bb39fbd679cd31ce7e584a1bedca69868606a13c0e3bd0a136a1fca1dbcdb516452d34e SHA512 2550aba009b8ab66230e7b21fd1cb5085c92bc280e31f35c9b02dc78fa138ef9b9ece0d7801473b88d11866b013c6fa3bb6e9611bdc1a7b85144e50a49829774
@@ -94,7 +83,6 @@ DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f6746
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST fat-macho-0.4.5.crate 19395 BLAKE2B 647db9fb4dae829942976a53a251b64dcb4b418eef79f0783dae15a3c0c87a965390d3a2bec0fb5d66543ea258708541444ec04ef29332f53e43526359a163d3 SHA512 fbbb56f10ff74483258c02052f44c25c06ac4c79cbf0172af124b2634b283e22ad8b82ed7ecf563cb99ba2b93e656f5c8d6eeb98f09b893638928fe27b22b533
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
-DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
 DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -112,13 +100,10 @@ DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f9
 DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
-DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
 DIST globset-0.4.9.crate 22929 BLAKE2B 91dfaeb99a3f6f40a5a025ad8527c91770545487324e191801eedb6f916739b5efe687d84a43eb8b712cd181d98d3ab17b839f30c19e0da041b4c34d9286089f SHA512 66841495098b028b8d294c0832276b8864760df3a16b93b57222037c351591ac7773a99a65b85a20c438fbfc04c56ea4901188cb18ed470d3481eeef29eab708
-DIST goblin-0.5.1.crate 156923 BLAKE2B e71e22f276ebddc164ff326a2d819a3d208c3e449b0667b8b374a4810710eb5d8857280fcad2602b36b949bc634ecfc59ae01248626c2e5f6b21fa236345db22 SHA512 0bc3cf899adf42906664697503cb4633cd2af13a91a0eee85e353a6247b1874745f1f77fd1b4c5aea4bf78c6a94adb01bedb1c5b79604b06378d9a485c9fe346
 DIST goblin-0.5.2.crate 158017 BLAKE2B b590ffbbc10430f470410a784934a8c14525055ee922074ba7ef19dd1a3326e9b42fee3c20b2e1d6257719df7574397f188373abd29ac7ef6125fb0c4cdd0b1a SHA512 e061cdef41c0c6896c8e9842b33090c4bb2b8760e27f73b2a4d680c5e68aab272d977f5cfea4fd528af5d42366f5047623d64e41f9a6b42203dff2521b3c68f8
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
@@ -129,14 +114,12 @@ DIST human-panic-1.0.3.crate 18064 BLAKE2B 5dbf7c696da12f912a86ff886dbbd68013205
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
-DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
 DIST indicatif-0.17.0-rc.6.crate 44795 BLAKE2B 985be7b0b8a2bad4856428b3b9a287832894b10b28fd84e45460eaee20cf1bfc78b52e6b37c57909bea19d686a70e8a0e21b8b718b84c03a46fd457f012101aa SHA512 225c0f1fe4cb81010c6d1a7dda88f90b0ff524dc2eafc758ef109e8f0648fb68bdf43ac06279b9fae66c32ad6f469bf20a623594565cd11e3b4a4c89454c5ed6
 DIST indoc-1.0.6.crate 14312 BLAKE2B e4757497450f9c5e854f472e576c0df49f1aecb10e3ae77ca56b436dbefc5c75fd9b83093f9bb485b697d32c454af5d70d72da27e231124f7af20d3dc6e320e2 SHA512 798d36767d29ac5170a9de498ebee1056a6658e74b94310d589d429471ae059f974bd83eaa823c99a637c16758b3fdaaeaaaf7b21a2a35cbcbf345840b5f23cf
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
-DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
 DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
 DIST keyring-1.1.2.crate 30205 BLAKE2B c2f3c48daa6c06b0de4c9f459d563d70b483764e53237e6b868aca4d4d08835ad92df3c2f928c8ec571f54e96173148a530f463ed55e5e5a8a63a975b7b496ed SHA512 aeee8dde066f3f49a4089aa778be6934758fecf7877c3bf285d84b2a97f47f504c7d4bb7903f9af32e479895e6842a7ff84399e520e7d80050c896839aa2628f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@@ -150,14 +133,12 @@ DIST lzxd-0.1.4.crate 21891 BLAKE2B 8271b79bdf6c65a17b5fe77a4d8b7d3a96ccf1752d21
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST maturin-0.12.17.tar.gz 299343 BLAKE2B 28daf0ae1aead28075c730c8acdef875918f0c65fcb6828987ffd1b6967221dea201c7988574e216826a35a7938972318e1ec22ade3977259dc610464c940b7e SHA512 21649167f9fc6ebd1388e2cf5aa58a1656fec3bbd1f4d97e4753de7992171faf56bb2a9c0e5d19d2965076ae0e0333db0c1958e7af13473b4af7ccd3c2039992
 DIST maturin-0.12.20.tar.gz 303609 BLAKE2B f509401b4b32a6700e08b72ec9ae49d5593df9b55e26ce3f44d62c9755429ef785a60442b540fe05159ed0ea6fae72c3230dcf517cef7e5085184ce99d0d0032 SHA512 e221711509d6c3997df49e934e73f41df3c7cdd975db9fd13a22fc9d6a2f2bb9aed33763c70f8516665918537a032e113b55d69936f65e72bb2ac5e46b45be89
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
 DIST minijinja-0.15.0.crate 93033 BLAKE2B c69b65bac7814b728999cd91481a60e41fcc00b4ad889e59a7c4b5f7439aee9d0e3831c387e8cd7ac95ca33addc87cf2c6ee219f7886a28f23db36ba17c2372e SHA512 b236b143be91e621a4295f704f3dd5a75c9bb848b1c4500731efe38ddd9a13c63696350313360ad0651013636eec899238257cdae297b70ac42d375c4a18479d
-DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
 DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
 DIST msi-0.5.0.crate 58953 BLAKE2B 642d76410455e08f3b9200bc572631d3e3180bb917f786e88756b7239f351f0650da92a6490aad244d5b278feeeb561aa28abc8fc7fac6bd65fa3b3c34479b3f SHA512 70c7829f9f92d9d8c38b92cb8d7ebf8fd12e21ede253b94258a57741f5c062aef866f3b99acede26c586b33e255f14a6d628e56494851849ec26c71891300514
 DIST multipart-0.18.0.crate 62797 BLAKE2B 438abdd6041c3a52e836b7627bb0a490494b6a0c4ab47d27905480fcdde27e7c18497ef4cae550c14b8c4c34e661176ee640806cc427e3b2e570c38be31d868e SHA512 a34036e1c05c241f130ed30eb7a2d96c2590ea8c0cb7e6cf98c160ca0fc6e0f1227192b45d8166abd7221633c36c57718fdb0ccfa8ff4254d4eeb3abb5210704
@@ -183,11 +164,8 @@ DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1c
 DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
 DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
 DIST openssl-src-111.20.0+1.1.1o.crate 5102014 BLAKE2B 3328b4c0c5d76c9176ebf31805380b7170a3eb5b0673631c5130bbb11da39b448438645247408aa7f804092a01ca1a682ac244710973bbb327a3920da0dd2722 SHA512 8c937c1f739411ca1ae6de864fc2c41b7342a788f076e8d83f27d9e8c93d9d0e1994f85d0f6d62d288fa42d1773b7c4bdad6b71f69e3595baf39a3017287c70e
-DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
 DIST openssl-sys-0.9.74.crate 59808 BLAKE2B e616a0194828afe67d617e4032ed354385935ff7aa40eb495781b38b134226d5c5cfc5f9405e6273c96622245b6d4771a71b7b9512e3be7feba9a2ce88b66ecd SHA512 18015ce4dc8f15f3c371d393f4654db11b6e5ecaadbdf6cd9f020ee9aee29f3fa12a8dd74d432d8e8b5889162491b722f855b02fbf0892c8f2003bc4e692254e
-DIST os_str_bytes-6.0.1.crate 21079 BLAKE2B 85c4a5f450d74bae23e2d2ad1c20cc944ff93fee1ab2fb700692645586acb388d552dca2b326f7df2cc4d07f6a3bdf7aa6704833be211f392250a56786519224 SHA512 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472
 DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
 DIST os_type-2.4.0.crate 8022 BLAKE2B f37d9f43bfb242f1df0f2a5928923265a3ee44b29ffb119475098fcc7ff46340ba70bbc51e00b6e0b29c4f63aa50531f3f825db82ada46b19c429b3aaa52c7fe SHA512 2860d1798e146e4e476c2bd76085e031cd999188a42519ce86ca7bd168a2eb1907d690e15176beff21966135e68ef0cb45b05ee143e74240c2f8d3c1a5c35bf8
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
@@ -219,7 +197,6 @@ DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e
 DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
 DIST pyproject-toml-0.3.1.crate 4536 BLAKE2B a51454289467647437738c2a46a6d166f18c8025a62d7da744f48f7fa7ba395b4b01a9e030eaf9116e0f10af8e3d0afe699a393acfbc8db92cdc3fc3c08c56e4 SHA512 ee2cfe91d4204f97c17243f278dd2b05de6c8fba962dadaafdf47d7f5401845018df3625b7b7e80c2be32b6917c6b244b2705e9d44c5f0030d65ada87cabb2c0
 DIST python-pkginfo-0.5.4.crate 199520 BLAKE2B 4e6a23dfdde6d51ad9a81732f02a42c2c9aea56b36518e140cfa42c78e0c534b0f62a7da32965f18aaef1f416226f94df352e6f9c3cdfd95521debe7d9510b09 SHA512 7afbdfb4f2e06b4e76726c371dc6bc8904e3a7259cd455bac27172dc10abf6295c37eb6ba91c90be4347aaceaf211ca312b011568ce4d779286c5af016448aa2
-DIST python3-dll-a-0.2.2.crate 50752 BLAKE2B 557bccb012b2942b06337cae44a4c77eb391d0edcc43e326a1beffca2978a675b9de311aca2aa33da74b48a378100236dd1312170352593350814afac5caaebf SHA512 8c1143c7b67fd674fb6db5acc7dc464461735dc2b909143b4b8f7791924e25d542d95e5cf0b65e320631f11963e6e5b985ff17501f4a58ff1ec1370587b509dd
 DIST python3-dll-a-0.2.3.crate 52115 BLAKE2B ac0d8aa5f1b9bf955067d59ef75e0c32fa2fa6da99ac2b1c02940c0c25c0f4099f3f2eb00ac37a3190cea9df79e3b797edc3ec228273c9cf54303576465adccf SHA512 56a5de431aa12506ab668166e39408441bb452071726cfb67ae542a14c8ba32e960ca20262b955d85749e6c3f54cecc088cc715fc6a3ce082a37e65e58e18b64
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
@@ -231,10 +208,8 @@ DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e220
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
@@ -255,7 +230,6 @@ DIST secret-service-2.0.1.crate 26355 BLAKE2B 01d0457e7fe16a2f86a67a3e96c6acb3b6
 DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e731a86cf19954c1c402cb5a6721f20af11f1da87370791fd71f95b1febc1b9c90acba8d5416987fe97502cd5f SHA512 92f01a95f6d20bca1e9101f17cd7a7be7e002d55a0ad792c0a1b6b47c510c8e902a8dc33f683ac35800e39020453b0300b79a41fc32f29c8eda9a9d57d456fbc
-DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
@@ -292,10 +266,8 @@ DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST toml_edit-0.14.4.crate 105387 BLAKE2B 63b364d812969fb206ec8ec38e8c0264bdea3a3e7482e2f253c8b0c4e9903bb5becbea6ec03f38d9236be7cbe8111a437e667b901ed75fe32d6de3f94d3a2790 SHA512 613aefe6b648eb202002d447a63cec1b83aaf6ba04e964491069198a0fc39ad11268509a2ebaddd68ee3253bc28df2a0e771cc2876c57136e517850a3926fa4d
-DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
 DIST tracing-0.1.35.crate 72680 BLAKE2B e3f07d2c7bdc72b6845be0a18473a3a24ec0d5212a88eb1bae34795319b6500d6b8c52ff674842f5ded1f0c8cf983977a66964c16779ce1511a2e0d81cc3855a SHA512 939f649d1578e569b974ced1f28678e494f4c42fa5e6c981f38188dcb2d960f71140627e4f60b86d926d44473b311bc855e85f8d90e43932ec3ac7eca7c02394
 DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
-DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
 DIST tracing-core-0.1.27.crate 58328 BLAKE2B 3461f13caa1042fc63d7defed2e3f49a286d870e0dee51776a90ee8558a2036781c5561923afd9b858b8029bc95a224bef973009b928c9ae050fe4a20d42a8d7 SHA512 8627b2cf4285e461b47288d885ac627bc6cef1083111e1413e2608dccb9c65e55fd2cf1a979d8a507891cf8bf11de40af32a434e9ddec4ff57f7d4c04e3bede0
 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
@@ -314,7 +286,6 @@ DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa028
 DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a779f156f8b0945ed96e6698a6c168498d3e2f0bbb648ccc3357fd17da73861b0b8a42550fc4f7f1f8c31fb SHA512 3d7093e6ac7cbc70f55a095590e9a92eba747421317fd7dbcb8096e36764925a3d1a02665567079f23ba765e63fc085d8b398283cd4941008286d8bf0d134050
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
-DIST uuid-1.0.0.crate 48627 BLAKE2B 87a7b85a7423869a78631dd49855f662185db6be21162da2168cb88c8b6d271bc079e3226026b32919a00e9c4e5fcdc0dba2a8d8aa05ae7f79397c77571404c0 SHA512 9bcd708e12924f0af8c7b554ea428d809f1f93e21a0ffb9aaff2ce9f74d8829677b9d0a4e95200a219c88a0bf8bb5437597ce5c5a7174b458d9ab3e6abe70c57
 DIST uuid-1.1.2.crate 49511 BLAKE2B ea25eeae5181b977fcf9a462cbfd4fc5175b0dd16dc19aaf0d6c250a7eec312a6c617aa320c4ec9f452c200ca3aa803146a45cbb91053f500b100eeb14d8c7bc SHA512 de1d1019d224c248e19cbf8a8539dc55937b23f74c5a8b11a445f8b7c155d35caa2001d6c710f4a4a8c034446162ef32c0e3be9f3d43631477c6f3d350acf7d0
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
@@ -322,19 +293,12 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
 DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
-DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
 DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
-DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
 DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
-DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
 DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
-DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
 DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
-DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST web-sys-0.3.58.crate 696212 BLAKE2B a76b29a2a1b46239e1e6b134004bf43bd127466d9920077196e59b3ff419e059f433f94a68c24f3a6361d4f751ad3b69c6bfa67cacec0f0a2a58c87f319cd475 SHA512 58215a0d34bf0478514affa8d85f46017ab565b1dafd36f98a1d0f93e04f909b8b09348c06a189700111b5a8bee2049640a3a3a1433c4939e60bb12f32092b05
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.22.3.crate 242291 BLAKE2B 70509e4fe7e1df706c66dee61200dd73372ed37ad9dd08db81687bfca6d2baffa4a9588054a827cae3c7e55a0aa31de220c5cb205467bc2891188cef1949b776 SHA512 4015b9f98127324efd8219a3a1f3e7f3bc7d67023838fa924a52df8815ff80a5caca351e12219b24be594fe55448ea06b5e040c19b4d14156a115fe5c70c245f
@@ -351,13 +315,11 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
-DIST xwin-0.2.3.crate 216507 BLAKE2B c8d7c6aa89c422227cb0afb65c8869369ce94ca7a09bc8c0ff78c713956a5e6952e9ac3b7bc266210df850ec6a4f8d1a6727c79485264e9f176c179dc0460b99 SHA512 baa087ddae40c0b15e988e58451855283ec0fa2cde0a1e68da7f0472881723d23b99a366fbec68be5be6f18a0d8dad8eda6ec065f0e48dc412f471750f9b8d71
 DIST xwin-0.2.4.crate 216729 BLAKE2B f3d2d4a549be57b2cac10b7912f12a71b721297d1b4e6511f21a6f28d089155cd094a814f06b84a568a5fb83ac6e2e51291c4f83423b5163796b96c58f664c62 SHA512 085dcbf80ac12a6538341d10cb06225ae2e530bdec512a016b28ae615952a4991c4664e48e0b2a1e35175fd3f694c636d67f96248a70c814be2bb26e1b9d96e0
 DIST zbus-1.9.1.crate 62908 BLAKE2B 3b443cfa9ea778b95574382784ad23308b08ab810e5b42908d92bb3bd02c439416c99d66de1c9e673284dad9a4023f5c53d8d3935f78779c165013f7e49a1269 SHA512 95b6018bcbec9656dfc8e38b72ff78d9c6cc43209e0930969f0fe2a1a2c4ba2b2437397dc2de0321a75fc5689595994e9b9769c0b0f25a0ddca9f227a64a3800
 DIST zbus_macros-1.9.1.crate 14675 BLAKE2B 36da6420fd908febb695e9ea767f4928f34b7deb2be286ce14b77e0fc5fffdeec950b6e130d374a3eaf0d2a28b826ed7cb55f1c7e17f31eda1872b4c13f18179 SHA512 05a84bb3db5b773c132db27a63123dd8d22acab62f2db5aaef8373d049a27e7fe994ec16e959d512fc280c34b42cdc979506417a30ba8a1626131f37c4d27f10
 DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe3857e42ee235bd479875811619001ad54378fa7bcacce8acbe7dca30199eaf88ddc47a91e47f15e0396e22 SHA512 a044090643e22d792a83600631d2828b3fffdc25260bfd7de703d20871c23deb6cfb121dbee9cdd5540125c96d113a9516f26b9f07cbf6f260725627166f130f
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
-EBUILD maturin-0.12.17.ebuild 8037 BLAKE2B c5b406316271cee7e2603da966ac839a55954628826f504e38d7eda4b73db31dae54522fdd6bc2183f4e0ce3b9ec1958a79c22bdde4e303f705cd0f38f607609 SHA512 98b817e77795ce2b1d68137aeb2dd60beb4595a928f6db4a6a1af9c70fe40ce68b13439557dfd1c804b4e22727156c2ea16c65d3dd70e6341cba7272b43fde7b
 EBUILD maturin-0.12.20.ebuild 8472 BLAKE2B a4c605e6946af255031a7375d6bb0c82ee779d65529a0b3bc1fdc44dad4f5d08a87c029750106a13a4e676eddc3be7fb21075c5634d0370a4ff10b1fa3537dd4 SHA512 f42663d3d1ffd376cf0454342f74fc437a8937dc56eb9c3cdf61f967796d458d5916beaddfca87ee52230e54b9f70b410bbdc8c5d971979ad4f1e75da7e0861f
-MISC metadata.xml 536 BLAKE2B db6debbdfe3fbc3107e6683cab0a93686735191fe9a04602112023938ce570f5c6ded2a72c850280e61f7ba8b1e7ca93198f93e03d4750649f2c03d7bf60095b SHA512 010e51df2a4364b5f26e2c2aa6e645e5f26d40d9c22e7782305eccc25f59b37b5287f210373383994a5db40f9ffd2a6a52848bc9ed80066521de665358b1e29a
+MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
diff --git a/dev-util/maturin/maturin-0.12.17.ebuild b/dev-util/maturin/maturin-0.12.17.ebuild
deleted file mode 100644
index d626ae92cf87..000000000000
--- a/dev-util/maturin/maturin-0.12.17.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aes-0.6.0
-	aes-soft-0.6.4
-	aesni-0.10.0
-	aho-corasick-0.7.18
-	anyhow-1.0.57
-	async-io-1.6.0
-	atty-0.2.14
-	autocfg-1.1.0
-	backtrace-0.3.65
-	base64-0.13.0
-	bitflags-1.3.2
-	block-buffer-0.10.2
-	block-buffer-0.9.0
-	block-modes-0.7.0
-	block-padding-0.2.1
-	bstr-0.2.17
-	bumpalo-3.9.1
-	byteorder-1.4.3
-	bytes-1.1.0
-	bytesize-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.0
-	cache-padded-1.2.0
-	camino-1.0.8
-	cargo-options-0.1.4
-	cargo-platform-0.1.2
-	cargo-xwin-0.8.5
-	cargo-zigbuild-0.8.7
-	cargo_metadata-0.14.2
-	cbindgen-0.23.0
-	cc-1.0.73
-	cfb-0.7.0
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	charset-0.1.3
-	chunked_transfer-1.4.0
-	cipher-0.2.5
-	clap-3.1.18
-	clap_complete-3.1.4
-	clap_complete_fig-3.1.5
-	clap_derive-3.1.18
-	clap_lex-0.2.0
-	cli-table-0.4.7
-	combine-4.6.4
-	concurrent-queue-1.2.2
-	configparser-3.0.0
-	console-0.15.0
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.2
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.4
-	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.8
-	crossbeam-utils-0.8.8
-	crypto-common-0.1.3
-	crypto-mac-0.10.1
-	data-encoding-2.3.2
-	derivative-2.2.0
-	dialoguer-0.10.1
-	digest-0.10.3
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	either-1.6.1
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding_rs-0.8.31
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	env_logger-0.7.1
-	fastrand-1.7.0
-	fat-macho-0.4.5
-	filetime-0.2.16
-	flate2-1.0.23
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.0.1
-	fs-err-2.7.0
-	futures-0.3.21
-	futures-channel-0.3.21
-	futures-core-0.3.21
-	futures-executor-0.3.21
-	futures-io-0.3.21
-	futures-lite-1.12.0
-	futures-macro-0.3.21
-	futures-sink-0.3.21
-	futures-task-0.3.21
-	futures-util-0.3.21
-	generic-array-0.14.5
-	getrandom-0.2.6
-	gimli-0.26.1
-	glob-0.3.0
-	globset-0.4.8
-	goblin-0.5.1
-	hashbrown-0.11.2
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hkdf-0.10.0
-	hmac-0.10.1
-	human-panic-1.0.3
-	humantime-1.3.0
-	idna-0.2.3
-	ignore-0.4.18
-	indexmap-1.8.1
-	indicatif-0.17.0-rc.6
-	indoc-1.0.6
-	instant-0.1.12
-	itertools-0.10.3
-	itoa-1.0.2
-	js-sys-0.3.57
-	keyring-1.1.2
-	lazy_static-1.4.0
-	lddtree-0.2.9
-	libc-0.2.126
-	lock_api-0.4.7
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	matches-0.1.9
-	memchr-2.5.0
-	memoffset-0.6.5
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.15.0
-	miniz_oxide-0.5.1
-	msi-0.5.0
-	multipart-0.18.0
-	native-tls-0.2.10
-	nb-connect-1.2.0
-	nix-0.17.0
-	num-0.3.1
-	num-bigint-0.3.3
-	num-complex-0.3.1
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.3.2
-	num-traits-0.2.15
-	num_cpus-1.13.1
-	num_threads-0.1.6
-	number_prefix-0.4.0
-	object-0.28.4
-	once_cell-1.10.0
-	opaque-debug-0.3.0
-	openssl-0.10.40
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.18.0+1.1.1n
-	openssl-sys-0.9.73
-	os_str_bytes-6.0.1
-	os_type-2.4.0
-	parking-2.0.0
-	parking_lot-0.12.0
-	parking_lot_core-0.9.3
-	path-slash-0.1.4
-	percent-encoding-2.1.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.25
-	plain-0.2.3
-	platform-info-0.2.0
-	polling-2.2.0
-	ppv-lite86-0.2.16
-	pretty_env_logger-0.4.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.1.3
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.39
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.4
-	quick-error-1.2.3
-	quote-1.0.18
-	quoted_printable-0.4.5
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rayon-1.5.3
-	rayon-core-1.9.3
-	redox_syscall-0.2.13
-	redox_users-0.4.3
-	regex-1.5.5
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	rfc2047-decoder-0.1.2
-	ring-0.16.20
-	rpassword-6.0.1
-	rustc-demangle-0.1.21
-	rustc_version-0.4.0
-	rustls-0.20.6
-	ryu-1.0.10
-	same-file-1.0.6
-	schannel-0.1.20
-	scoped-tls-1.0.0
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-2.0.1
-	security-framework-2.6.1
-	security-framework-sys-2.6.1
-	semver-1.0.9
-	serde-1.0.137
-	serde_derive-1.0.137
-	serde_json-1.0.81
-	serde_repr-0.1.8
-	sha2-0.10.2
-	sha2-0.9.9
-	sharded-slab-0.1.4
-	shlex-1.1.0
-	slab-0.4.6
-	smallvec-1.8.0
-	smawk-0.3.1
-	socket2-0.4.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.95
-	tar-0.4.38
-	target-lexicon-0.12.3
-	tempfile-3.3.0
-	termcolor-1.1.3
-	terminal_size-0.1.17
-	textwrap-0.15.0
-	thiserror-1.0.31
-	thiserror-impl-1.0.31
-	thread_local-1.1.4
-	time-0.3.9
-	time-macros-0.2.4
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.9
-	toml_edit-0.14.4
-	tracing-0.1.34
-	tracing-attributes-0.1.21
-	tracing-core-0.1.26
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.11
-	twox-hash-1.6.3
-	typenum-1.15.0
-	unicase-2.6.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.0
-	unicode-linebreak-0.1.2
-	unicode-normalization-0.1.19
-	unicode-width-0.1.9
-	untrusted-0.7.1
-	ureq-2.4.0
-	url-2.2.2
-	uuid-0.8.2
-	uuid-1.0.0
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	void-1.0.2
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.80
-	wasm-bindgen-backend-0.2.80
-	wasm-bindgen-macro-0.2.80
-	wasm-bindgen-macro-support-0.2.80
-	wasm-bindgen-shared-0.2.80
-	web-sys-0.3.57
-	webpki-0.22.0
-	webpki-roots-0.22.3
-	wepoll-ffi-0.1.2
-	which-4.2.5
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-	xattr-0.2.3
-	xwin-0.2.3
-	zbus-1.9.1
-	zbus_macros-1.9.1
-	zip-0.6.2
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-CRATES_TEST="
-	libc-0.2.119
-	libc-0.2.125
-	once_cell-1.9.0
-	proc-macro2-1.0.38
-	pyo3-0.16.5
-	pyo3-build-config-0.16.0
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.0
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	python3-dll-a-0.2.2
-	syn-1.0.94
-	unicode-xid-0.2.3
-	unindent-0.1.9"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED=".*/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-zig-tests.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if use test; then
-		# used to prevent use of network during tests
-		cat > "${T}"/pip.conf <<-EOF || die
-			[install]
-			no-index = yes
-			no-dependencies = yes
-		EOF
-
-		# run plain 'python' from eclass rather than auto-detect 'python3.x'
-		sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
-	fi
-
-	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
-	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
-
-	filter-lto # undefined references with ring crate
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	# pyo3_no_extension_module is xfail but passes with >=rust-1.60, still
-	# need looking into but is not known to cause issues, disable for now.
-	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \
-		--skip pyo3_no_extension_module
-}
-
-python_install_all() {
-	dodoc Changelog.md Readme.md
-	use doc && dodoc -r guide/html
-}
diff --git a/dev-util/maturin/metadata.xml b/dev-util/maturin/metadata.xml
index 87c093bb0471..fdeb3d0577fa 100644
--- a/dev-util/maturin/metadata.xml
+++ b/dev-util/maturin/metadata.xml
@@ -15,5 +15,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">PyO3/maturin</remote-id>
+		<remote-id type="pypi">maturin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index ff635c99765a..a30a1b51be53 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,6 +2,7 @@ AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST bbmustache-1.12.2.tar 17920 BLAKE2B a91df2d85533de4ad2df661b19e5dea67e84b73fd0192ecac43b8c9163beeb4444872af605ad298b104725687f2a5a2107b0d142a4654213f7b817903c06aca2 SHA512 aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
 DIST certifi-2.8.0.tar 153088 BLAKE2B 1718b805a2c340586c908059bd1e38cc5175f534136efcf6022ba970cd6f00100ef209953aa2718f2b25e76b895ddcf57c71690660f85ea519eb353d24ec612d SHA512 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
+DIST certifi-2.9.0.tar 156160 BLAKE2B b2599590e18da52685fd953b62f54ec1db7fac749d202bd4ec865a5477348bbcb93712af89b9206723da7bd33339461205a43b4cd30f486074b617ddd92ab8cb SHA512 d8c2f62b3b5a626735bbdaf3fb553bafe2cd1c736a378240633f0970c35079ce610ad3458d3e43c79f244c670b5e197554ddf8a71944bdc0975213db693a5583
 DIST cf-0.3.1.tar 10240 BLAKE2B 0a13aca11772ea8b7a9ed6a5908a013b82248a64ca633c616ed75b3ccc0e7d52199480e53519f96c1767ceef9c863da16840ad90d1d7c6235cb6ea3291d35b8d SHA512 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
 DIST cth_readable-1.5.1.tar 19968 BLAKE2B ecaab32aec9e327a2e39ab7312bbaf07c5ab4a88916ed6d84e064897d49f148486b9d95a761d9243cbb8b3cc0a779c9075f1eba179db0ec5e22502176e8c10e5 SHA512 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
 DIST erlware_commons-1.5.0.tar 53760 BLAKE2B 042b321c2d0e5ae82801ab982a989618b2cacf4aef921162d6185e4bf4790346765fae265ab9ad337b58ccd0a928199b8b95823528fdd7cb8c440288efb7dc88 SHA512 215072e79da4edf51ac6889721c0d4cefbee60fd5e2a803b39acdd2735b5e91f2df690b94f14a9814f63a4cd3e4762e8d7f87f6debb3e659e542a6dda5159739
@@ -11,8 +12,11 @@ DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86e
 DIST providers-1.9.0.tar 14848 BLAKE2B a50e97faee63bb62335005e61e63de0a1b9ebf467f61e316fd0002485fbc6a102689bd0881878db95972a367ac2ee56c603bfcdd0b8e5efc6dfeee7e177fea8d SHA512 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 DIST rebar-3.18.0.tar.gz 436403 BLAKE2B 827fcb8a3fb9f3b93a19260696546697f766ea83a498cf79943568dd811c2afcd05a1c666b6813116428d0c1e6f522617244b69fe19cebda2701efdc3ec68763 SHA512 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
+DIST rebar-3.19.0.tar.gz 442286 BLAKE2B 834bd25fb301a3362ba281638ae5680c1d7315971e85ba1b90cd3f0452ad1d1f6064c0d197d960c1a88af539ddda955bbef6747d71c1c69103af2938a9b28a04 SHA512 43928e2b96ca9361af2ec0b6ceb82f4429e29990054e1cbe2f1d4e293748243d16a8d2b809200ce443408a82fd3227b2cfe02efc14941d1cdd3d3c9a689fa0ea
 DIST relx-4.6.0.tar 75776 BLAKE2B 1e9b6043781ee2835f2cd7ff37755456de63e34702fa1e2d8c5326bc58f953700f1a5acf4b1bf073b4d30ff2587d4fdc505a0c1dc0848675ed98a10b9277df1a SHA512 a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
+DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a670da96c62852df75c9d68236bffee05ce84390f63cef34ee305fffc864bb2a5a4c2acfd02cef2122c27 SHA512 cd7bc3535d012f8e2bf98cf9a68c03425903c137557c18599a27d80722471353623e616787fed791760c0ec6ec51379e060a57777521be33ef84b37b3693f9c3
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-EBUILD rebar-3.18.0.ebuild 2457 BLAKE2B 8a571d50eb1fee488b56be5d2745615ef7e7765a0c506e0ce279c1d6274d97448dacdc7066b9383f7960d384e91fe04fec0f4fe5c539c8cd072c415c24cb3a24 SHA512 165e9a80984513b4fa0ce6c95f154f6d3e1d9031e1419c9f7bc91bd995dec0b23aad920be2e236eb9c63b0ea86db0b953234e44ee881c6d0c90c3673149496a6
+EBUILD rebar-3.18.0-r1.ebuild 2462 BLAKE2B 9bdf8762c0a0dedf4ebb5626b5403dbcb847b97cfaa18474fa91d815a816b7c9f926a7e3fd78be27c8fd03f81efaa131e391366405ce053171bebc6c8bdcdd8e SHA512 a005414b5f1fb40fd17a5fa4e0233d50e20d7750cc5eb95831af2090a136fa2f09a1d841690787814636ada855b760cb3303fc0c547ce7af7ee8bbd2b334287c
+EBUILD rebar-3.19.0.ebuild 2467 BLAKE2B 6ddd2cd70be8c2c931e7ce85ee791042a50258a4f69c480264e30505a8350e45ee8fca69534a0c15548fdfe89ac80c9318e77df1b444a7e69f8526c0f61697de SHA512 aae6547794b8a5e08b6ca4709a07db8f3b34b6e1c0a3491d88a56425cb2cafe1712c2dadc2f67ade1c1e9dd6d34164d989062e9520491472b6541e4fb21b36d6
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.18.0.ebuild b/dev-util/rebar/rebar-3.18.0-r1.ebuild
similarity index 99%
rename from dev-util/rebar/rebar-3.18.0.ebuild
rename to dev-util/rebar/rebar-3.18.0-r1.ebuild
index 7aef643d13c2..06e277d964b5 100644
--- a/dev-util/rebar/rebar-3.18.0.ebuild
+++ b/dev-util/rebar/rebar-3.18.0-r1.ebuild
@@ -33,7 +33,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lang/erlang
+	dev-lang/erlang[ssl]
 	!dev-util/rebar-bin
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-util/rebar/rebar-3.19.0.ebuild b/dev-util/rebar/rebar-3.19.0.ebuild
new file mode 100644
index 000000000000..6229094316c4
--- /dev/null
+++ b/dev-util/rebar/rebar-3.19.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}3
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
+SRC_URI="
+	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar
+	https://repo.hex.pm/tarballs/certifi-2.9.0.tar
+	https://repo.hex.pm/tarballs/cf-0.3.1.tar
+	https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar
+	https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar
+	https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar
+	https://repo.hex.pm/tarballs/getopt-1.0.1.tar
+	https://repo.hex.pm/tarballs/providers-1.9.0.tar
+	https://repo.hex.pm/tarballs/relx-4.7.0.tar
+	https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar
+	test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
+"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/erlang[ssl]
+	!dev-util/rebar-bin
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# The build directory (where dependencies are usually stored) gets
+	# cleared before each build.  Make the fetch function first look in
+	# a _checkouts directory before going out over the net.
+	"${FILESDIR}"/${PN}-3.18.0-bootstrap-vendored.patch
+)
+
+src_unpack() {
+	# Unpack the rebar sources like normal, but extract the hex.pm
+	# dependencies separately.  The outer tarball contains another
+	# tarball named contents.tar.gz that actually contains the code.
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			# Assume that the .tar files are our hex.pm dependencies.
+			*.tar)
+				local dest="${S}"/_checkouts/"${archive%-*}"
+
+				mkdir -p "${dest}" || die
+
+				# Extract the inner tarball
+				tar -O -xf "${DISTDIR}"/"${archive}" contents.tar.gz |
+					tar -xzf - -C "${dest}"
+
+				assert
+				;;
+			*)
+				unpack "${archive}"
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	./bootstrap || die
+}
+
+src_test() {
+	./rebar3 ct || die
+}
+
+src_install() {
+	dobashcomp priv/shell-completion/bash/${MY_PN}
+	dobin ${MY_PN}
+	dodoc rebar.config.sample
+	doman manpages/${MY_PN}.1
+
+	insinto /usr/share/fish/completion
+	newins priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins priv/shell-completion/zsh/_${MY_PN}
+}
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 0210471ec11c..28df4af7c4e0 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,7 +1,9 @@
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
 AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
+AUX rizin-0.4.0-capstone.patch 681 BLAKE2B ad680ca6ee4782d0a164048e9884a3154fd817ffea42810dc3e11ebd9b5254da7fa1c1379180ba43eec9d3b1966329ffbc7a807df1beee6bcc9879e7e7b5cb65 SHA512 dca9648697d9b419002d27de4ac562ec519c4ffd2161960c489c90e5c0950beaac7a7e9b86cfa32a34efdf60f11fd953547b9a37fe457fe294b5516e5d07d412
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
 DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733 SHA512 9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
 DIST rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz 172591261 BLAKE2B e78843fd95ac0406f66490b7253206e77787fc65780bc7c6a67d26aa9618a6f85803a88724ad424a7bdeeb20d95ebf9314e582029ac778d7d4de4f207ff54aad SHA512 ada4a3faad94553f0f2802419ba604177bb66d332b1a351effd485d65bd8365abb36d736486bbd0bcbc0da584ad4a2edaa7aa3cb62fa12811282c2e0afecb950
+EBUILD rizin-0.4.0-r1.ebuild 2483 BLAKE2B f776c97d5a1e27a5df6e0426c37daa5c8eb8d8f12234c0fbc2f0a2320fd256a41013b0529059c6b40ffc3a827846dbcbf723cc337b10a138dd975d15f00c9133 SHA512 ee556a24f162fa5288dcf7b26f694d96160f741078fcf1be0ac2e22e5d2931d21146fb717dd9ea70514f8194d65e77d2bb829573b8e38f68ac011f3ca9f6ce2e
 EBUILD rizin-0.4.0.ebuild 2450 BLAKE2B 68537bc3cac4d53376e36e455275838be5ea072c78644e0354b70888c19f89c671156f632933970a8ee787f62a532ebcde7a74199d625a996501a0a030185e4f SHA512 20a2da4dd0a4d1ae6d237ac64b751bb88a45ccc44556a434be540334f1ae68d0fb95055ca38eeeffe1959ef2310e24fe6a9dac24b10a3bf3a6d91126261070b0
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.4.0-capstone.patch b/dev-util/rizin/files/rizin-0.4.0-capstone.patch
new file mode 100644
index 000000000000..4132e97095f6
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.4.0-capstone.patch
@@ -0,0 +1,22 @@
+From 2b8104bc5e763ed841d6dbffacbeaf02e86b8421 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Thu, 7 Jul 2022 07:50:10 +0200
+Subject: [PATCH] Fix capstone include directory
+
+---
+ librz/analysis/arch/arm/arm_il64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librz/analysis/arch/arm/arm_il64.c b/librz/analysis/arch/arm/arm_il64.c
+index 2e9da10aece..6b552596c9e 100644
+--- a/librz/analysis/arch/arm/arm_il64.c
++++ b/librz/analysis/arch/arm/arm_il64.c
+@@ -2,7 +2,7 @@
+ // SPDX-License-Identifier: LGPL-3.0-only
+ 
+ #include <rz_analysis.h>
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ 
+ #include "arm_cs.h"
+ 
diff --git a/dev-util/rizin/rizin-0.4.0-r1.ebuild b/dev-util/rizin/rizin-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..b298dce57be7
--- /dev/null
+++ b/dev-util/rizin/rizin-0.4.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="64a6f26369bf5893ecc20cb8984a5ad506ef8566"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/"
+
+SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
+	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+IUSE="test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="fetch !test? ( test )"
+
+RDEPEND="
+	sys-apps/file
+	app-arch/lz4:0=
+	dev-libs/capstone:0=
+	dev-libs/libuv:0=
+	dev-libs/libzip:0=
+	dev-libs/openssl:0=
+	>=dev-libs/tree-sitter-0.19.0
+	dev-libs/xxhash
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+	"${FILESDIR}/${P}-capstone.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	default
+
+	local py_to_mangle=(
+		librz/core/cmd_descs/cmd_descs_generate.py
+		subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
+		subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
+		subprojects/lz4-1.9.3/tests/test-lz4-list.py
+		subprojects/lz4-1.9.3/tests/test-lz4-speed.py
+		subprojects/lz4-1.9.3/tests/test-lz4-versions.py
+		sys/clang-format.py
+		test/fuzz/scripts/fuzz_rz_asm.py
+		test/scripts/gdbserver.py
+	)
+
+	python_fix_shebang "${py_to_mangle[@]}"
+
+	if use test; then
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcli=enabled
+		-Duse_sys_capstone=enabled
+		-Duse_sys_magic=enabled
+		-Duse_sys_libzip=enabled
+		-Duse_sys_zlib=enabled
+		-Duse_sys_lz4=enabled
+		-Duse_sys_xxhash=enabled
+		-Duse_sys_openssl=enabled
+		-Duse_sys_tree_sitter=enabled
+
+		$(meson_use test enable_tests)
+		$(meson_use test enable_rz_test)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
+}
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index 13753934d109..42885de0745e 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,4 +1,6 @@
+DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789
 DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e
+EBUILD unicorn-2.0.0.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 EBUILD unicorn-2.0.0_rc7.ebuild 1635 BLAKE2B 3395838b9b1b40dc602fb58cab4081fcca8f0df4fe1d0990a71368dbc0e7e5ed2076b53559c485563fede19059c769f1580587746b5185c2726caa76f8b193e7 SHA512 26dea296997e337cdf854d4faa4c6eda2a16fb0b7e370c7c361d92153f9b5a37c706b0ee365691b5c69850f8fcd9cea80086ae368fdaf4e1d388fef81cc4047d
-EBUILD unicorn-9999.ebuild 1635 BLAKE2B 6b1ef99c0458971d413f0ebae78886de1c6375c3cce9edfb338b739a008cc17b1da636333d7952f95a000412a82ce4add748bcf7d32629a17257b8bc5e06bf97 SHA512 e80f886de510d66d8421d34747cce745237cd806f4cd2e286eb1cd38952553efd978ecfaf7ff0bfb4b9493a80c88e3bdb004c74a78b3c46caae792b8184adfbc
+EBUILD unicorn-9999.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 MISC metadata.xml 510 BLAKE2B 857f3ee3645ffdb28846b7305ec3066ddf49934225fe2c173a5a6b5b8354b208b6bb1337c2e11713b7c983a6fe3a1e67dae62bf64b0c9228f14ccfea8d57d5c5 SHA512 e1da17744042b95f11fb8b5f562020738c7495b0256469420cfa19fda995a24f02e806f67db8521e2f4a19a32825bf54a0865ec723d853cd5aa440c42b007946
diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild
new file mode 100644
index 000000000000..34777b117a28
--- /dev/null
+++ b/dev-util/unicorn/unicorn-2.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_/-}
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
+HOMEPAGE="https://www.unicorn-engine.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
+else
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1"
+SLOT="0/2"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+BDEPEND="virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )"
+
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
+
+wrap_python() {
+	if use python; then
+		# src_prepare
+		# Do not compile C extensions
+		export LIBUNICORN_PATH=1
+
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Build from sources
+	rm -r bindings/python/prebuilt || die "failed to remove prebuilt files"
+
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DUNICORN_ARCH="${UNICORN_TARGETS// /;}"
+	)
+
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-util/unicorn/unicorn-9999.ebuild b/dev-util/unicorn/unicorn-9999.ebuild
index 01c1ff6ba6bf..34777b117a28 100644
--- a/dev-util/unicorn/unicorn-9999.ebuild
+++ b/dev-util/unicorn/unicorn-9999.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_/-}
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake distutils-r1
 
 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
 else
-	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -34,12 +34,12 @@ RDEPEND="python? ( ${PYTHON_DEPS} )"
 BDEPEND="virtual/pkgconfig
 	python? ( ${DISTUTILS_DEPS} )"
 
-UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x"
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
 
 wrap_python() {
 	if use python; then
 		# src_prepare
-		# do not compile C extensions
+		# Do not compile C extensions
 		export LIBUNICORN_PATH=1
 
 		pushd bindings/python >/dev/null || die
@@ -58,7 +58,6 @@ src_prepare() {
 
 src_configure(){
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DUNICORN_ARCH="${UNICORN_TARGETS// /;}"
 	)
 
@@ -76,5 +75,9 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index e95034168310..53d28f13f879 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -1,5 +1,6 @@
 AUX watchman-2022.02.28.00-libatomic.patch 2254 BLAKE2B 4eec2caf20f9c892bd9d2a7961da35cf79b606bc519a7b0b725b41b9fe844f4ec9ebc8de233565fd4889c492b7c3b45581e00e6c90ca981f37bf3f047f93f577 SHA512 12fbe5afb62008c97a60340ea05a148932ffe9428f2c0114fbe2fccf7ff428aa43e6a0c856edb78ec1a0d81cba92dd6cda92a079c24213e77b69d6bb88a25b06
 AUX watchman-2022.02.28.00-python-working-dir.patch 2409 BLAKE2B b92a51ac410063384c94047681a93fd3c2033a92dfbb0d65c9b00463696fb7917f03faa20c5f39dd331d6e7715db7b53d1fa77ca3ad20caa7b29971e90c8da21 SHA512 6429eab55af5faa6bb1cc946792209541f5c8228c1dc48de89a5777d2c402a41515f6810b6c3fb760c4c3bc2bfbec8b5b9c44f6d72229e20aac5988bb2a1fb4f
+AUX watchman-2022.07.04.00-python-working-dir.patch 2455 BLAKE2B 3a8c37f87884caae46d87194d397cefd6f1d58d78d22f3cda43bde3a5262a9d88dcf8f1747790786a889384ee5fd0ed2507ed2faffd63f338e08b445aec2876e SHA512 9c7bcea9502e5fa11e63ca3b0fb0132a67512beece934becf9a2ebdc1097f29b7a454a22c519f801779da8c9e682d2d306fa79e2f38cc1d21aca21d3a25151e1
 AUX watchman.tmpfiles 32 BLAKE2B 88c6a5c4b1d7a35d4ed485ab1e7ba0e18a8433d176318f69e77030d4980931876fdd8d1811e0af8c924c89c358cffb7cc9ab4effbc363cfae8adc6d88597313a SHA512 5c4230d23a045704efd5851abe0cb4c6e9eba91e128bbfc677e231868ea161364055fea65800a9b8bec61d95c6a2824dffa536755e12d3b6599a81cdea5c063b
 DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
@@ -85,6 +86,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
 DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3e7b70e3e3021d0cf76a15f7d072e0c86589d4b9f8c32d75e0c055a8dd30832360e669cc3d7f86061d214a3e18adc61a3781 SHA512 129eaded13ecaff0f4bfa2ffcd5fd27a1685a5f98e53d7b9dba837ad09054c9f8054992d92009580e20f80f367eb71276edab11bfbd4604ade353b08a29076d7
+DIST watchman-2022.07.04.00.tar.gz 3785684 BLAKE2B b27f71cd5d505d9383858434eaa90dd9a70478507a2750f10c3fdc88e39978cc6f94402d498dc26e2b5043018913bf71a28c04870dbefe8ee79fbe3e963a86e8 SHA512 43bbccd5e69905105da54fb661f506d2b3ef43719660deb07cb4b3b47b1569af71edcdc798ffdae79ec26c7cf24988394321d0f183f20af51daf6d54f4a3d8e5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -96,4 +98,5 @@ DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
 EBUILD watchman-2022.03.28.00.ebuild 4692 BLAKE2B 380179dc8f5d8a8f98136d9078a6950c4136f7859dc7fbb8ff6e858292426ccbd171db50c59d6722439adcd7808c2f7ccf007d8003caf932922ecf51ab61da82 SHA512 0c25b80ba316477132eb6c940b50ff1b470a23644652405c38d4248a0b939b68e356417c1c625d9acf11cf98b5ecef8e74bf4298097b937f2ec5965f287db998
 EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
+EBUILD watchman-2022.07.04.00.ebuild 4687 BLAKE2B b9b8376653dab8674d042f6f5a0f4f99deeb1459e8dba60e975711d239e61f40a7871ea04dc1ba84e694a242a48957f3766b119a38aaafbd46ba52899fd638c3 SHA512 ac344b1bc10a34808b4a9453280cd682a77bc8e687e7cc8b8e50d9bb413d17a668863a3ebff904d459a0481dc67f4bc485d2a635c3251c25af3a03bb1d672883
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch b/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch
new file mode 100644
index 000000000000..cd475fb1bfbf
--- /dev/null
+++ b/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch
@@ -0,0 +1,73 @@
+--- a/watchman/python/setup.py
++++ b/watchman/python/setup.py
+@@ -13,30 +13,10 @@ try:
+ except ImportError:
+     from distutils.core import setup, Extension
+ 
+-watchman_src_dir = os.environ.get("CMAKE_CURRENT_SOURCE_DIR")
+-if watchman_src_dir is None:
+-    watchman_src_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
+-
+-# Setuptools is very picky about the path on Windows. They have to be relative
+-# paths, and on Windows that means we have to be on the same drive as the source
+-# files. Otherwise it is impossible to obtain a relative path across different
+-# drives. However this has an implication that we will not be able to build this
+-# package outside the repository. Not great but it works.
+-py_dir = os.path.join(watchman_src_dir, "watchman", "python")
+-if os.name == "nt":
+-    os.chdir(py_dir)
+-    py_dir = os.path.relpath(py_dir)
+-
+-
+-def srcs(names):
+-    """transform a list of sources to be relative to py_dir"""
+-    return ["%s/%s" % (py_dir, n) for n in names]
+-
+ 
+ setup(
+     name="pywatchman",
+     version="1.4.1",
+-    package_dir={"": py_dir},
+     description="Watchman client for python",
+     author="Wez Furlong, Rain",
+     author_email="wez@fb.com",
+@@ -47,7 +27,7 @@ setup(
+     keywords=("watchman inotify fsevents kevent kqueue portfs filesystem watcher"),
+     license="BSD",
+     packages=["pywatchman"],
+-    ext_modules=[Extension("pywatchman.bser", sources=srcs(["pywatchman/bser.c"]))],
++    ext_modules=[Extension("pywatchman.bser", sources=["pywatchman/bser.c"])],
+     platforms="Platform Independent",
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+@@ -63,12 +43,10 @@ setup(
+         "Programming Language :: Python :: 3.6",
+     ],
+     zip_safe=True,
+-    scripts=srcs(
+-        [
++    scripts=[
+             "bin/watchman-make",
+             "bin/watchman-wait",
+             "bin/watchman-replicate-subscription",
+-        ]
+-    ),
++    ],
+     test_suite="tests",
+ )
+--- a/watchman/python/tests/tests.py	2022-07-09 05:21:29.017605168 +0100
++++ b/watchman/python/tests/tests.py	2022-07-09 05:21:34.920982537 +0100
+@@ -27,13 +27,6 @@
+ )
+ 
+ 
+-if os.path.basename(bser.__file__) == "pybser.py":
+-    raise Exception(
+-        "bser module resolved to pybser! Something is broken in your build. __file__={!r}, sys.path={!r}".format(
+-            bser.__file__, sys.path
+-        )
+-    )
+-
+ PILE_OF_POO = "\U0001F4A9"
+ NON_UTF8_STRING = b"\xff\xff\xff"
+ 
diff --git a/dev-util/watchman/watchman-2022.07.04.00.ebuild b/dev-util/watchman/watchman-2022.07.04.00.ebuild
new file mode 100644
index 000000000000..d70308e436e4
--- /dev/null
+++ b/dev-util/watchman/watchman-2022.07.04.00.ebuild
@@ -0,0 +1,210 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
+CRATES="
+ahash-0.3.8
+ansi_term-0.12.1
+anyhow-1.0.55
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+byteorder-1.4.3
+bytes-1.1.0
+cfg-if-1.0.0
+clap-2.34.0
+const-random-0.1.13
+const-random-macro-0.1.13
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crunchy-0.2.2
+either-1.6.1
+futures-0.1.31
+futures-0.3.21
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-macro-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+getrandom-0.2.5
+heck-0.3.3
+hermit-abi-0.1.19
+jwalk-0.6.0
+lazy_static-1.4.0
+libc-0.2.119
+lock_api-0.4.6
+log-0.4.14
+maplit-1.0.2
+memchr-2.4.1
+memoffset-0.6.5
+mio-0.8.0
+miow-0.3.7
+ntapi-0.3.7
+num_cpus-1.13.1
+once_cell-1.9.0
+parking_lot-0.12.0
+parking_lot_core-0.9.1
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+proc-macro2-1.0.36
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+quote-1.0.15
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.10
+scopeguard-1.1.0
+serde-1.0.136
+serde_derive-1.0.136
+signal-hook-registry-1.4.0
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+strsim-0.8.0
+structopt-0.3.26
+structopt-derive-0.4.18
+syn-1.0.86
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiny-keccak-2.0.2
+tokio-1.17.0
+tokio-macros-1.7.0
+tokio-util-0.6.9
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+vec_map-0.8.2
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows-sys-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+RDEPEND="
+	dev-libs/libevent:=
+	dev-libs/libpcre
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/glog:=
+	>=dev-libs/libfmt-8.1.1-r1:=
+	dev-libs/openssl:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	python? ( ${PYTHON_DEPS} )"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch
+	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+	export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+	export RUST_CARGO_HOME="${ECARGO_HOME}"
+	export CARGO_HOME="${ECARGO_HOME}"
+	# Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+	# so no need to force -j1 via cargo jobs
+
+	local mycmakeargs=(
+		# Rust wrangling
+		-DUSE_CARGO_VENDOR=ON
+		-DGENERATE_CARGO_VENDOR_CONFIG=OFF
+		-DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+		# General bits
+		-DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+		-DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+		# Fails to build against fbthrift for now in libatomic troubles
+		-DENABLE_EDEN_SUPPORT=OFF
+
+		# We handle this ourselves
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process watchman.conf
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c5554d13fb90..605ea3ea6ba7 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index f59030f926f5..df2019cd09df 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -11,7 +11,7 @@
 # and inter-module dependency checking.
 
 LUA_COMPAT=( lua5-{1..4} )
-inherit autotools flag-o-matic lua-single multilib ssl-cert user toolchain-funcs
+inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs
 
 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
 	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
@@ -133,6 +133,8 @@ unset -f _apache2_set_mpms
 
 # Dependencies
 RDEPEND="
+	acct-group/apache
+	acct-user/apache
 	dev-lang/perl
 	>=dev-libs/apr-1.5.1:=
 	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
@@ -437,10 +439,6 @@ check_upgrade() {
 apache-2_pkg_setup() {
 	check_upgrade
 
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
 	setup_mpm
 	setup_modules
 
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index f0d6c4f6f6c4..c43d5b4d9826 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -410,9 +410,8 @@ _ruby_invoke_environment() {
 		pushd "${WORKDIR}" &>/dev/null || die
 	fi
 
-	ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
+	einfo "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
 	"$@"
-	eend $?
 	popd &>/dev/null || die
 
 	S=${old_S}
diff --git a/eclass/user.eclass b/eclass/user.eclass
index d5b827d2e76b..b4f63ffab4a2 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -7,25 +7,27 @@
 # Michał Górny <mgorny@gentoo.org> (NetBSD)
 # @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: user management in ebuilds
-# @DEPRECATED: acct-user/acct-group packages
 # @DESCRIPTION:
 # The user eclass contains a suite of functions that allow ebuilds
 # to quickly make sure users in the installed system are sane.
 
 case ${EAPI} in
-	6|7) ;;
-	8)
-		if [[ ${CATEGORY} != acct-* ]]; then
-			eerror "In EAPI ${EAPI}, packages must not inherit user.eclass"
-			eerror "unless they are in the acct-user or acct-group category."
-			eerror "Migrate your package to GLEP 81 user/group management,"
-			eerror "or inherit user-info if you need only the query functions."
-			die "Invalid \"inherit user\" in EAPI ${EAPI}"
-		fi
-		;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ${CATEGORY} != acct-* ]]; then
+	eerror "Packages must not inherit user.eclass unless they are"
+	eerror "in the acct-user or acct-group category."
+	eerror "Migrate your package to GLEP 81 user/group management,"
+	eerror "or inherit user-info if you need only the query functions."
+	if [[ ${EAPI} != [67] ]]; then
+		die "Invalid \"inherit user\""
+	else
+		eerror "This message will become fatal in EAPI ${EAPI} on 2023-01-01"
+	fi
+fi
+
 if [[ -z ${_USER_ECLASS} ]]; then
 _USER_ECLASS=1
 
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 651f0fb8ce2a..9401e8de1a9b 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index eb453652834d..0ae7061a6853 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,8 +3,6 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.18.2.jar 46592587 BLAKE2B 1a6a1092fad0133a23a91e1db8d8057d418f52c23d04bcbe8e3578582bffe7d8c0e653c8893b78978fed05b2fc7b5f99643c35cae2c427d9ca76ff19aa6f8b58 SHA512 efc804cdce8b616126f1e0bb0bc43538571da85cd8cf25e8b0c9d787be6b2149319801389a90841b5450b029c248dda89de5d8295e93d0b58004d519c09b91a8
 DIST minecraft-server-1.19.jar 45538778 BLAKE2B 1f71b5f80746394fd747f6fecbdcecfb125f893dfc51aaf153150a16aa77894b6e8487dfd7b8f87000ff12f49135caa07221a2b885481ae20f54fa2cb4d6d1c8 SHA512 46db739cc49f5f3a31478467c0a470e35ef4c61e5030a9617f32da32efc45e290a2771d9b729b5272b1b6176cc5ca6675100f7fa1ba6e510a68b6cb96c7c88a8
-EBUILD minecraft-server-1.18.2.ebuild 1166 BLAKE2B 9a69f43036617189db0ab7881ed5f82f0ce2e768eb98c8046c77ec7a2072660448d2619c97c73593ec0c83336496a24dc6c5999f8fe795c450f5410040bf6034 SHA512 9df16a90467c80e062a297db2151d749a1629f93923582a0fe24bf24fb4eaeb4ed1b4e43c2bda29d85c6de0a0f63c30b15e221b32592bf47c5c40c8e91975444
-EBUILD minecraft-server-1.19.ebuild 1167 BLAKE2B 278c2d8a8cdeef249b5f576450b180d2d7f9e59290e490715047f2d0112c9ecdf69bc4dc6fba487dd13b3dfa3e6f35fae078e8fe1c688b0b66b52164f7a5e0d3 SHA512 21f54feb662c2f552506885352a1e2c6f4c64a5837b5cdc695dde951e8e0363a5976980306efb8f49b792d0936fa9ffd65a2586678750459f3a2515747e7bd22
+EBUILD minecraft-server-1.19.ebuild 1166 BLAKE2B 8fbbc8205b8af725739aec461f891454852be963b5adfad88b4f762495d8d2f756ab4f6287db989833a4c7f59e0137a9305f11c07b5430fbdcb51db988ab0675 SHA512 d3ec698af5edafb48117efdcc8d56f1877fe8b2df103ed2f28e6c19c42f3d9b2a7184c944278143c8f286c8542e22727dff7a0cf24a171ade8551336f4163adb
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild b/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
deleted file mode 100644
index 3bd55f345cc8..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="c8f83c5655308435b3dcf03c06d9fe8740a77469"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.19.ebuild b/games-server/minecraft-server/minecraft-server-1.19.ebuild
index 50f1250ebce6..fe7bf46b2e2a 100644
--- a/games-server/minecraft-server/minecraft-server-1.19.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.19.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 849b8027631f..0740682714b3 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index cb5011cfacbd..f9f2e341173e 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,12 +1,16 @@
 AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
 AUX openrct2-0.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b15bfcb433b1c586dab100839bba49867c374669e27f9677c82f16c727b939dec28e95fbb42278b9661935aac3cc23fe6b8ad8b64901a029 SHA512 6f2359f8fbf1fc915909fe404300e016d4f8d55f3b0f59dbdbf10e6376c38c412de23394c2138fb56666be059221c60a8b488a6965f1b6be19e834a6fc624b53
+AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307f79f923dffffae1b47af55643b64d2776c075ad237530d0a0a074ffd62a18ce021d72fc3c4b4126e2880683c75648908 SHA512 8526095e8716d4885524483e6fe6b6f2ba7edf29bc7bd30602f37aebd5bafdc3a299e5890d3844fc1d573c69244d5415f7d02791e6ac73f9e421f88987bce2dd
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
+DIST openrct2-0.4.1.tar.gz 14307739 BLAKE2B d50dd896128898725eb7bd347341dc23a5ef4e8c83d3334625f5484dc5d4214a6ba19981997291de3edb80baaf498e9b4fd83b460a2fd4fdc2100c080d3d0bb6 SHA512 795e94b025ebe8ce4386e59723e2442e950810652a1c95caa1e21a88bef5417c2cce18c93418788e75cd8e980ffda0dc73838693fbe2be108a4e269da9159f06
 DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
+DIST openrct2-objects-1.3.2.zip 3954437 BLAKE2B 21d79e35a3bad343a4f96e152f8b5f04820fc927557f0526e639f7c04ca1fac61804db02be57261deb01d65c81f67783ba9ed8e0230a90b2626fa2b63ed82857 SHA512 88b292961d728c1ad31dd9f68ba9a1201a59126887030b7b4a8d9fdbed758c1b9bd4f29fb924ddd3cf7b4c5fb7c95f576a00fabdef5a8403e287edeb1c740ff1
 DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
 EBUILD openrct2-0.4.0.ebuild 3924 BLAKE2B 4a8d315a3cf45b6d27e012bb4c138d74cd45fe2f168d424dc277ddfd8c9d359e40e947ca48c5d0c0518d692e6f309ac7f985770f7adc4d6dbed0fd5991ade044 SHA512 1ccd0bb98691b68a125c2ed7ef2aa88326e979d34f6d9e81f1b132bd45fde59172fe23546b640fa19c4bf65a7c455ac071b087e3025670492c43f13a8ab6b155
-EBUILD openrct2-9999.ebuild 3883 BLAKE2B 2685d376f7e1f4e7d3f9739fe7add5992ad1297c7fdead8db7d9918b0d4a0026c1456c2c2f568ac2cd1fb6516da860f1369a4333f0be4ebd20141733bbf84c0d SHA512 5378717cb97f736f745058b09e9ffc3fc857e4231a76f1af024ff80f60ca9ebd2f02ef11b0029023c0d31425e34e083f9e7a2a14e63d2acf048c7ac2ad1b4fc8
+EBUILD openrct2-0.4.1.ebuild 3886 BLAKE2B 12d938638cb770f82e09c6c989f98460d981ea82f7fde60f0a9fa38b3469078b1b98428602615e4e65050250ec88102199b7038ee817dd49c9da93671b6a6122 SHA512 d4cfd4d674589c4c34e6da1b2a50f19f3721c781eebd903f250183df11e1c015ddcbb34fdba81db5ec4e9a27e5a08f7fd211415ceb543a65615bf800a2a10d5d
+EBUILD openrct2-9999.ebuild 3845 BLAKE2B c96028650a16d8ec637b116ce6fddb55046d3fbb5b8a33cf58e2b07cd8aeb73968849ea12ee761032388a4d45da93bac6424c610bd28e0669762d5507a781bf3 SHA512 fa7c4005cb39cb5680e3bacc104cefa5a3704c76e8b029596cc74b1d2705e2f23c30035d3bb744d5fd5a1b15a6a2b617fea5d586914aeefd980c7d63412c5bf4
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch
new file mode 100644
index 000000000000..1a9eba0fb3e3
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch
@@ -0,0 +1,8 @@
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -115,4 +115,5 @@
+     }
+ };
+ 
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_SUITE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
diff --git a/games-simulation/openrct2/openrct2-0.4.1.ebuild b/games-simulation/openrct2/openrct2-0.4.1.ebuild
new file mode 100644
index 000000000000..086cc24d58f0
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.3.2"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:0=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		opengl? ( virtual/opengl )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index cd60805a4bee..63415cb53ad0 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -12,7 +12,7 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.2.7"
+MY_PV_OBJ="1.3.2"
 MY_PV_RPL="0.0.67"
 MY_PV_TS="0.4.0"
 
@@ -71,8 +71,8 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
 	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
 )
 
 src_unpack() {
@@ -120,7 +120,6 @@ src_configure() {
 		-DOPENRCT2_USE_CCACHE=OFF
 		-DPORTABLE=OFF
 		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
 		-DWITH_TESTS=$(usex test)
 		-DUSE_MMAP=ON
 	)
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index dfa69b3b41bc..b875c0ec83ae 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index c7c18a60b7ca..1e30080e035d 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,5 +1,7 @@
 DIST libadwaita-1.1.1.tar.xz 2731088 BLAKE2B 0f1106cccd37200a5566fad9aa1becfb4d404ae4447184330ae2e427993fc161b235e7f39f95d137741772fb4efbc87723f6a444caa72a7708d6ff85a8ee7d6b SHA512 9700c9db2085d1f30399716e164bd338963353190fbe8161c3d50791ab56f4be8db2fbd939dde2553487944f3227a2582f5bd03cf1b6e867afa59eead16feab9
 DIST libadwaita-1.1.2.tar.xz 2731632 BLAKE2B e60201f6d2f51713350b3ec18dae10a5993c6fcea3491495b5e9878461a558609c306a418a59515f2b827b6ee8049ff09b710c4326a87e372e975519bec61274 SHA512 ae89c49986d1bddc5eacc736be8ff0842634bf564e73d4a456b6d899ecc0fcc337f27a17cbb5f8921009f45d82434ab22cf7c2bc9541c4179cd298c2d6706587
+DIST libadwaita-1.1.3.tar.xz 2731856 BLAKE2B 743d238779da843935149871f476426933b2b27424d449a32f0ac8a844e4980d65946f9a9cc79480e688fdd73c0e43cfbbc547aef2605dc34c800977825f33a1 SHA512 ffe3f5d3277d243a17b27055856e8c111fd856c22f07e990aff5fb48cd760928ff9389943b118ffba6671655af670cd0f0b8d2d5b34ee2265ac37249ddcaca7c
 EBUILD libadwaita-1.1.1.ebuild 1481 BLAKE2B c35cf9b03a4b089ee9ed676212eddc0f2b581d265f9a32034653be48a938fbd2c54e51ca6ff5b4a964636ef4b840c1a34372f3dc4101786ce6a6e22148fa5aed SHA512 9e35ad8d6788340e78e3d61ced1b40803c9b1bf032823ee8eb09bde8f28c9fe5000c7ed3c412b94f85ff16b670650efd521ab17d5b106cc2cd3815c88d305650
 EBUILD libadwaita-1.1.2.ebuild 1476 BLAKE2B 381b6bec1cf93025954e449213f7455c7e3a4aaa36854880a7b9824dbb2346870da325c6efc63a6c60ff850a1cfc21226d96768d8cd910b03162b46b2076f2c4 SHA512 7cc69e4adb0fe933d7c334e7451ed861066cbb8d5c9bbc32e919b6de204335661aff8bd20695387de0b852ccc454161755c0575133c7f106c35e091d26f5b66d
+EBUILD libadwaita-1.1.3.ebuild 1478 BLAKE2B b41edff61fa54d6ba1487b85521ebefee38ae26679197032e4418edbe0218c559caecb85491d1e4b642f9ce6c4cfe91843ce3d516ba5152bf3fdb9e17b7eb23f SHA512 2d7d65f6a2d2453a6bc41e399152f8d7b615818abb30159a265d0ea3c73142093b631ebedf3c1f0555dbbd69ba50d4595668a6f53a45322084fe306e0627db5a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/libadwaita/libadwaita-1.1.3.ebuild b/gui-libs/libadwaita/libadwaita-1.1.3.ebuild
new file mode 100644
index 000000000000..21b53489be86
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.1.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_MIN_API_VERSION="0.52"
+inherit gnome.org meson python-any-r1 vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+IUSE="+introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.5.0:4[introspection?]
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	>=dev-util/meson-0.59.0
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_use test tests)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install libadwaita API docs unconditionally, but this is intentional
+	doins -r "${S}"/doc/libadwaita-1
+}
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 454820e8bfc9..cb2855aff166 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,5 @@
 DIST libhandy-1.6.2.tar.xz 1783660 BLAKE2B 4819ee8917d324f795b5f983ba69a3a5e5e77addf45c83b63ab676407aadb335f1130d02f011a6fb479f7ab71fdac7030b6fadb42dea92ac2fa949ed6d240844 SHA512 482a848ec5b085e2c5dcc94a1a9be618de22f779dc8c8cc07945f6269d1061e96009700ee9e3ddf0ccac0ce2ac01ccb4da3a8d366f1b3b9ceecc282a46021a6d
+DIST libhandy-1.6.3.tar.xz 1785692 BLAKE2B e48c8724a5298d61412562f4be00e7c3198dae896d143319adc3c84296f0ce1272a46b23e432df02f184a330c342ed6c34bc072fdcc648cbf1923aa17105b3bf SHA512 bf210bc49b512fe74438759e2b8238fbba9c8ccd57e96b7a72f484df080a407da56ffcacbef3265da8de6a1edc954d4b3d77eaddbd1f62141d41db5c17253b49
 EBUILD libhandy-1.6.2.ebuild 1263 BLAKE2B 6f31b148d3a0f77bf7cf9103615c53e12999398a8c63b6faebe8b20523b43af14fa7edad32bf2708bd9aa2cc8597a8d53a463ea839872c1ce232833fde3a242b SHA512 0b0d31e8344e39ba0a5ed3de956eb0bdddc9040a0619e8b76490fc2784b80595ba525adba238c1803c2920fe77c4341ceb47be108db0dd02881016dfa31d3454
+EBUILD libhandy-1.6.3.ebuild 1268 BLAKE2B a724854ce5dc45197b3b5d9a596d18c55471c77f176c2cfc04d469765b06f6a910b83c4d110f2e7716239f0ec8ce8ac17421d694eb0a82914736f198e5fb9895 SHA512 8bb1aebc01a38e3813e2f310e90f967589d4fbac844d7299299ce23fe28c099155dae09d07d321eb7004c0c513150b7bcd4af90be2aa46b77a81deb170b6b903
 MISC metadata.xml 354 BLAKE2B 878f8199cb6cc83b1ab56f64fad507be89b9206e64a76182eac19eecd24e132674dacc223953a80635c61a7d59fb571138f44a56409ca97b2f192d304957c082 SHA512 1e2a3b1466ed49ab71e8a2c18def2b984b42b38936811ed170b47f9c6c925feba076eb671110801ae805f7c1eb175f6ed4db4d6a87e83a9e024e0b519cc45170
diff --git a/gui-libs/libhandy/libhandy-1.6.3.ebuild b/gui-libs/libhandy/libhandy-1.6.3.ebuild
new file mode 100644
index 000000000000..c396cac2d01a
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.6.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+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:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 259a692bb3d5..49b467881df8 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 3157ae76d1f0..5836fb817433 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,5 @@
 DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b7554c9596edb9735af862d23c585158737a0943a470637138cbc5275bee37bd2d820a7489cdd0747d98e6e22 SHA512 028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243
+EBUILD sway-1.7-r1.ebuild 2175 BLAKE2B 9847fd44899ef922fa04ddfeb810b0ad4c9ae930f785c2393b6b5e1d348c893b19c0e9f791fbd661b76eed3e4c4f9eb16ecaac1c794479f1e86680180eb115e9 SHA512 c25c1776915883c42113c358783706181402c5f052ef08a81c20380af4bae37da5e3c53b59f0ac9d6bdfc197f94b33ba713830d9e85ad4a9ed74d5b3825fd85d
 EBUILD sway-1.7.ebuild 1900 BLAKE2B 7969c477bc7a65cb67ad007e9105c7046af2a873bd3fdd1924ed37e74f60819973ca96061dbb5b97fedd20d47bd1832f939c4ad9ae0885c2549dc03972f980b4 SHA512 a702d1a00d4019c72e0bd54262ac4d0d7304835df6cbd92e93f94e8aee56f556331b0452c10c4dd3e221cd31fd04859804f62027d1080a2c1fece797b9359bdb
-EBUILD sway-9999.ebuild 1903 BLAKE2B 113b2fc429d5548cddffea57879960b17118ef2981f0b41c30c63eb0c30e7addeb16fcd496b458fe0657e4469bdc12a1d367b3deabbf9a8f20ac62519a9e8166 SHA512 57994aed03d7daa941f9e5c11babd6bbe8aea7ec1ecea819ee65f146b3eeee15ebbe388278dd21fc9fe5a6a4f1f1783493ce1257f840b392d49a4326ec1b6b2b
-MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
+EBUILD sway-9999.ebuild 2175 BLAKE2B 4fedd4d1dc45409a149fbfd112b055bb7921ccde21504fd1a88fe427c1b36ea5b4abb93d7e4a9aff9836bb5fb3d94ebb006724e8dcc825f6d88b8a02e428d9b4 SHA512 cb7b7b1972e7ecc104aa7203bb2f4925ff3dce838faeb6de818dfea5a468080d76c5c7f7c0584409bd0fa11014e37368b256cf6bddab6ac165f56f4cd19e6629
+MISC metadata.xml 2269 BLAKE2B 75c8e2e2550cdb3ca970806b724068e0e78d3b9f70dba320db25fe8637ecc5c70ebba9a9d604d30e8a79f2155949e9aabb0993e3fbb8fe4b626c471231eeb46f SHA512 07c978ed2c7e351b0f72c69e707c409344bdbf0ef1348d85b71d9876284b1f632439c74a924818d0401ad31dd2e1d328c7446dabbbda1c4db27b67cbd68d8546
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index 0f236d0a69f7..83ff81b0d4e2 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -26,6 +26,7 @@
 		something else.
 	</longdescription>
 	<use>
+		<flag name="grimshot">Install 'grimshot': script for taking screenshots</flag>
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
 		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
diff --git a/gui-wm/sway/sway-1.7-r1.ebuild b/gui-wm/sway/sway-1.7-r1.ebuild
new file mode 100644
index 000000000000..7ad45789f21a
--- /dev/null
+++ b/gui-wm/sway/sway-1.7-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="grimshot +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	sys-auth/seatd:=
+	dev-libs/libpcre
+	>=dev-libs/wayland-1.20.0
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	tray? ( || (
+		sys-apps/systemd
+		sys-auth/elogind
+		sys-libs/basu
+	) )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.15:=[X=]
+		<gui-libs/wlroots-0.16:=[X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	grimshot? (
+		app-misc/jq
+		gui-apps/grim
+		gui-apps/slurp
+		gui-apps/wl-clipboard
+		x11-libs/libnotify
+	)
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+REQUIRED_USE="grimshot? ( swaymsg )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		$(meson_feature tray)
+		$(meson_feature X xwayland)
+		$(meson_feature swaybar gdk-pixbuf)
+		$(meson_use swaynag)
+		$(meson_use swaybar)
+		$(meson_use wallpapers default-wallpaper)
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use grimshot; then
+		doman contrib/grimshot.1
+		dobin contrib/grimshot
+	fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 3f38a9b21df9..3c0073c3c363 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
+IUSE="grimshot +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
@@ -55,6 +55,13 @@ else
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
+	grimshot? (
+		app-misc/jq
+		gui-apps/grim
+		gui-apps/slurp
+		gui-apps/wl-clipboard
+		x11-libs/libnotify
+	)
 	${DEPEND}
 "
 BDEPEND="
@@ -67,6 +74,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
+REQUIRED_USE="grimshot? ( swaymsg )"
 
 src_configure() {
 	local emesonargs=(
@@ -84,3 +92,12 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	if use grimshot; then
+		doman contrib/grimshot.1
+		dobin contrib/grimshot
+	fi
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 67408a6dc796..dafdfaa354d0 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 11b130101016..a0ad8e41295f 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -2,5 +2,5 @@ AUX kalarm-21.12.3-speech-optional.patch 4053 BLAKE2B 70f49fde0e91654bfcbee359ca
 DIST kalarm-21.12.3.tar.xz 2197144 BLAKE2B 583a367bd883351311d5d84e48af9e8168a5d6ef6210e0191983079c02b9a87866d9b602a6a5b9bf0e78f9f183705e6be5876c23311d8e217858e5aa65e4e196 SHA512 6f56719774b99968a4037ec2aaf4938101ff012244e5b432daa0d5591a92ac7f454101770e01470647abd472399eac6bec8ecb7b5def4480dcc7feed779f4acd
 DIST kalarm-22.04.3.tar.xz 2347752 BLAKE2B 9749172b9246c0f903ccbf7fd6ca7dae756ac9cfab594a85cc0cdff772dc0f0c21b48b2f2c0ff71467b117f0e287def9c4202a033636ce93f1317a567ff8e017 SHA512 22650e5263d0a7bb584da138977da32cad38672f2e2dd2beb5ad1b9f31f76cbed68fd3b9ca5c241bacbc793ce5102da5b331b68e689868620f46aab2234d26c4
 EBUILD kalarm-21.12.3.ebuild 2422 BLAKE2B 24c2e4b04c26a6f0d1e4a0092826e3fd7162aec5ec1b33c5093f5ba57e4ffa4d8aef83129e4e050bb49134331ebb3f36337b90e998ef0d7b915fce4a84f88204 SHA512 8376d1a1dabf2ee158e99a71dd06314a0a22018445822cb624cbcb9e83691e223c625e0b5e60928b05798289447376c8c53e289a5939f338698dbcc3fdf69ceb
-EBUILD kalarm-22.04.3.ebuild 2352 BLAKE2B a3afa8badca9b94dac94763f58366c57b4f2d16859bd0f3319d93d95bf3aaaf44d486bb3818e657bf273bdd9c005aff0903a8b89b7c8d0f234644f8cc0058992 SHA512 acd5b8c1da626cad48a10106b7c08d323e44cc5abe2c2efa1ab1dbefa4c7a59f2649d9656951894563c997ccb6a254d04f5a699a37f8ba783a536ca09cd2c532
+EBUILD kalarm-22.04.3.ebuild 2485 BLAKE2B aacc2e5a94249656ed37204bde3a2e25a480021fdb3ec78e58c0f6241680418a916fa0f78626d85ff6222a5479d3a62ffbe71886be7681351939a3006e36ed82 SHA512 dca968e925f5baafdd7d710c3c5b8f5d7502b042d4253be98c38804c5980d1c96db19965e64f00f4b3762bad52726a8396b45052106655b0c590a32f7186388f
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kalarm/kalarm-22.04.3.ebuild b/kde-apps/kalarm/kalarm-22.04.3.ebuild
index 7d3429166a96..f42f8f79e808 100644
--- a/kde-apps/kalarm/kalarm-22.04.3.ebuild
+++ b/kde-apps/kalarm/kalarm-22.04.3.ebuild
@@ -78,3 +78,9 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+src_test() {
+	# LC_TIME bug 665626, 857012
+	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
+	LC_TIME="C" TZ=UTC ecm_src_test
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 1787ac96cfb0..390c32ce6f24 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 8a4356f0d46c..539ad4cdcef3 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,7 @@
 DIST attica-5.92.0.tar.xz 69292 BLAKE2B 39ebb66e584b98d35c25b7086ade046bdc032c48978d91bdf5d60f28067c3fd3aeea307c8394aab937eb1be81e026baf4a08218e27d3ff07e14f1767d951dcda SHA512 cb82bbe7d2ba6bd093eb09c3b658af24462ba82380a93138eaec367caacbb6f89931dbcfd8a560a576c51d8f4f532a96dd3ec56fd404c92214d38705fd18fb9c
 DIST attica-5.95.0.tar.xz 69296 BLAKE2B e8eef2d3b207284e7417c41829b62b04b447381a6a105d355343d6806511d409331eaca208e062d0a8907a2051700f38f0724c266773a411411c33536c6aee40 SHA512 51dfb53ebcaaac03306c256e156ad79c49f0c44ee01973fe3ecf55c7f0bee50c2f6032c3b3bcde1433cbad0df98a110e5ffc30657fdb02b10101c5111efac1ee
+DIST attica-5.96.0.tar.xz 69896 BLAKE2B 1f707b2262ada63825eab246dc5db355f89f6dd42e50b10bffc3096af3d184b59477030bc3fcf347a04d4e2e62d2ecfcac3fb83aa01c3979c76db9f47be92559 SHA512 2dc8e32594e95d7d7beb4ce3125e4e81f9e11068b7c0c017b1473dcaa08661f3ed1f3c4d6627bb2dfcddeaff584e8f8ab3fe703d234faecac392653d6a185a0d
 EBUILD attica-5.92.0.ebuild 474 BLAKE2B 01f4561366de6a2c831394cdb1642685c61ab9fc3ef434688e407735382cae2613e807de8759a629e56035b990a87d5476faf2106e5719d4d4faf3459bee085b SHA512 1502f08219f7180dcc8e4073357d766bb491448bb8051af55613e3e90819c4fdb6f0bcb2efc20b39b7c26b64235565c4d91e49cf46caaf12419196fce19113cb
 EBUILD attica-5.95.0.ebuild 484 BLAKE2B 350d4b879b2cbe6b5b15d2b2ad34dbc3e85a14e028055153f2fd534e2ae329caf2f0b955a164712eda62ccaa69deccd2f03c7214954451d67ad8394f5296fd5b SHA512 edf7795e9062d91b648426e56b66a68a634f18433ebfbb3349704879f38bbb765edff6a1c481410f0e21fd07f09e2dd5a3cceaaffe39310356a823559db73172
+EBUILD attica-5.96.0.ebuild 484 BLAKE2B 286f0858aceb26f6ecc6319ee4ac1353f1cf4fc0679cff3324d803fd2db4a4968ebd01a54b56a52cd38768b89258224d3d519a0fd9988ecc64ef503047201c69 SHA512 c72fff245f78c62ec3cea2a17255e87da560a45529e754c71d2d523dc2e39ade594b070730d9eb8dba0fba631f308fe21d594275f68d00935e4fe180a90ee374
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/attica/attica-5.96.0.ebuild b/kde-frameworks/attica/attica-5.96.0.ebuild
new file mode 100644
index 000000000000..0993b2574f46
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.96.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 0e9b215aecbf..36bd03596ed6 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,7 @@
 DIST baloo-5.92.0.tar.xz 287616 BLAKE2B 4120a298a4e4b30ac9ffd2e797e84c18252c3d69a8f5e82db1a73b6aecc4b3b1e0200eb35cece221296ff5aa2c65ea6cb385945c2b624b21b67e94da543f005b SHA512 0914420618d6c79ee370e308a2fdcb770fd276136aa8d73fa3afbc76d4a51aac7236ecc6f386ef4fb0cf9776daaf3f2056cffdadd0c948420b4fcb5c292b9d64
 DIST baloo-5.95.0.tar.xz 290040 BLAKE2B 0674f13225ddab93da8850cc1f2b78ce3dd178d65f3e902fa322fa9a6cd28c673c606c19161d4b8d23feb14042aab198406cc2fea8b459967e0fe90d9a875bad SHA512 2da152ee9af939290d568a851aa69ca4b6ad119eb4d6ca6cd86818391d5922f34c5f556ebacc92be9ef6e9e2d6eff40275a12e4022fd649264fb80eebf8ada33
+DIST baloo-5.96.0.tar.xz 290372 BLAKE2B 97458de69b414bb441eb00123cefe59646be4ef28dbad762a38ea83f643ea4f482009f5d366024a556c72f07b76f510de5c5b73fbc5eb72716d46f2d51f678a8 SHA512 b529720173cd739805b56e311158e288cffd6f6ef866d4f4a87ff01c2f186016c6a79c27f47626ce5437fedcd025a9cbac933bfebf98575fa71257af48c8afc0
 EBUILD baloo-5.92.0.ebuild 895 BLAKE2B fa17a316589efe4f05492dd3c75652d54bfc96ce45efd14724e26b67f25a4f840493ef4680e6f7b3cc2c39ba99c0a0b63abdd5b68a671c9bb361e16dcb707f8c SHA512 a0df0efc876d11082249a49878a693f1670f8e92e1d729ca445a49440932f16b0407a80b259446ed6de3266f32bb7361d3e5227fe0584c72bac54ffcd60e62da
 EBUILD baloo-5.95.0.ebuild 905 BLAKE2B 44574b055ad12916d06189855b8d02a9d2e941e96f00957b6016341f092889e73257409b269b361a58b6b4bb929f805807d8d2895b3bcaf00429ef22c71bf8a5 SHA512 1deeab122ce35d36ae128b89aff8dcf65bf745d5b7bb402068e74e657a40ec8d59e99bbc807d6c0b22413809f68860f57d2a3d11027c58dc9571cbe5a18f4df5
+EBUILD baloo-5.96.0.ebuild 905 BLAKE2B b7135aaffd1ee003c1e908c63f76aa8c6557e4fdcb2b87830912a8f26a3b33010e2c17a8d9ffd76072c8b62f83d4ce791b7144839fbb734998d11b94ad82cd39 SHA512 fc1483a8ff866050241a2971305291688d4535a341eef37d62373796265537686751586356fe8483a10e5e9b88611edf4195f53976d49aa27eb66705779caa3d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/baloo/baloo-5.96.0.ebuild b/kde-frameworks/baloo/baloo-5.96.0.ebuild
new file mode 100644
index 000000000000..47ba879712cc
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.96.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 624250
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index d4d8c08fb645..ccb069165e57 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,7 @@
 DIST bluez-qt-5.92.0.tar.xz 113940 BLAKE2B b34dcd937f1f01c43935862df3dbddf09109aefb66c1e5f56790be43d2db4116ce1528177b0e9ffd8341b69867f1c09db7289de680b44575623f3ee6d77f7471 SHA512 fe258828731f6efc71b7fe83fff1613cf57fc41b27ea1c5a72063bb65df42e101cf68942aa668c39c3905ab4df9d03629d6d6b97c2cf98bea176069c11aa183b
 DIST bluez-qt-5.95.0.tar.xz 114004 BLAKE2B a69dd475ac1efecb9cb44dcd4854e577911db74460395a29fdfea0cdb6ca9d89ea2c20986d547d7a722c99ad7b8aa5c2f7bf06186796af676be1bba3fa2cb12e SHA512 35c3949dd1d7c1693c76fcd409484b6f33e54f00a421ef3a1c0e5edb0c09c3925893bdb0531d9e9e849f981daf59a6c4f6ecd8c964c9edd167232f015d091197
+DIST bluez-qt-5.96.0.tar.xz 113964 BLAKE2B 43174bc0c444e970e1265de3695c7558da65d418e6add255a679d9f81ea9816edf84be56ac38312ea5d043f8da832cbb0704791006e19967c27b1283bf8e7beb SHA512 7bb47fdada886b3561fd46884216c184acb1a233f898f6b7de30a98743dbddeb52f02374213d4e2ee71fa0a9cf6cffc0eedac52de83146454050b70b9060e7ff
 EBUILD bluez-qt-5.92.0.ebuild 685 BLAKE2B ac3324ab6e189c2aba8f2cbe14567b07a0ab1d59712ff8100aaf3ba2b640688fd29d1b3e07788af363b14e3d0b7b6b10eb19659fb91a7915096faeb23b82780b SHA512 53bd2c1950af3028b3f0c4f8184e9d5b55d46d5ebaf094c33c6b01c2e28c4b5955e3fb6fbdf88cb6d83b1556a39b4c86661d4d7456d32c8fafb8c9731c8fbc78
 EBUILD bluez-qt-5.95.0-r1.ebuild 794 BLAKE2B eed058e2eccceee87a0cde8d9c45e5242ad424a2836f0a3cf1b1a64afda430d043d2505e1f0de554a5cd8ae798929912707fb6f21539c6fd5391212979699640 SHA512 60440e5daf8938a6384c328b7b365f80225b77821a5ab12820dc958aab4376d384305abc264640239946200a4141c385f71b928a984256d716cc5c57ac7c5f6e
+EBUILD bluez-qt-5.96.0.ebuild 794 BLAKE2B 60c17c18dc071485499e4d34be2b130163aa03b682b0630f29e82b7ae770daf002a53f74c5ecf0a50a31a908677afe416bae12aafbe0ff862d4700411577df48 SHA512 8f368d352e2fb548cacdbc1bcd8bd88c138a7040345a96f498c0c271fda9ded964dee796b2b2777f046ca443d996ac05110e8b230f045f017d5de0e832239190
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild
new file mode 100644
index 000000000000..da642fc3812f
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	udev_reload
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index fbba10b2fd2f..9fb37e69f730 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,7 @@
 DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
 DIST breeze-icons-5.95.0.tar.xz 2150968 BLAKE2B 52bf40937e5a245b86231a4ba936a329afdcd2c1eb2e72f1a07157dff1c88431a211c02bba11b07698bb56e9df8179fff74a7b7a3d2f544c4001b048ccbeb6e5 SHA512 a1a9d01d0fe78b769340b99ba83205e952a01e73a5b2b5edeefbbbc39c8819038c8b7f6d70248aafdf182eb4ccc9f00954f19482e034b0045e5f0278f56db1e2
+DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2
 EBUILD breeze-icons-rcc-5.92.0.ebuild 918 BLAKE2B 035e3f978707d7998edc6ef235fdaccc883af1a427cee00c54001d432205afe61addbed6417caa393619369d75eb1ce5d2ea702acda7e2a4e70dce888cf4c68e SHA512 ad2dc084e2867a8458537f411059674a19f65d802ae113dd040f6bcb9b64bce1d3200aa53d4bf40d0614241c0e9af8589937cdadcd1b5e4d57c20efa94621f4c
 EBUILD breeze-icons-rcc-5.95.0.ebuild 921 BLAKE2B 5bcfbc6e04823a4d8719b3a118b8cd066da14c9e7f36a6553f37af2eff6d3e71caa1d2051e8487699b3cce57326887ceb94d99ec995c097177ecfe151c377a4a SHA512 274fe0fc1c855ab2685476d9fb40b2b74eddb6f23769e4d291454c057aa4dee91a6df13e3db8abb4980bf647dfe667614da99b96e6d9eda66c875113d380fa0e
+EBUILD breeze-icons-rcc-5.96.0.ebuild 921 BLAKE2B 2559eb6723db5390123d3466f1058e25426b8c6ec1b32d43f96300dd4cfbf7b1baba25d9e9e68cb700f49964b03fd200a03abfbee4e768d36153ae05984ca7c7 SHA512 dd6f42602c76a4746863118fcd9d7ccb35097b1e74976bf4b8a2b96d247dea19fd158bf3e77bb08ec0641fe5821981699b21d97c6432a65586b915ff530a01a0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
new file mode 100644
index 000000000000..c10fb63498d1
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="breeze-icons"
+PVCUT=$(ver_cut 1-2)
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake kde.org python-any-r1
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+python_check_deps() {
+	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	cmake_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index cf99da4de140..a0234a44c2c7 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,7 @@
 DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
 DIST breeze-icons-5.95.0.tar.xz 2150968 BLAKE2B 52bf40937e5a245b86231a4ba936a329afdcd2c1eb2e72f1a07157dff1c88431a211c02bba11b07698bb56e9df8179fff74a7b7a3d2f544c4001b048ccbeb6e5 SHA512 a1a9d01d0fe78b769340b99ba83205e952a01e73a5b2b5edeefbbbc39c8819038c8b7f6d70248aafdf182eb4ccc9f00954f19482e034b0045e5f0278f56db1e2
+DIST breeze-icons-5.96.0.tar.xz 2153664 BLAKE2B ecb8e1b19674c5bedcd78c2e1c9950c4129f2e422e9ee0b0031fc42c85d4791c572c0bbb01d967ac74f74ae5535e1b5053029a1afa706cf20836a7416312da15 SHA512 116388d8670a1b45c01252fafe2d316bf5045207d8c4d282ac1a9e87882bb512f69419aaea65895cf310112de0f514199f1b698d28a48d0c5074e14add0a25b2
 EBUILD breeze-icons-5.92.0.ebuild 1117 BLAKE2B d6edc6ee5bec5c55ffa0fecb1f2212f8b7726f2d1dccbab198aa6bbcb77d0fed2f7e2feec55e733f9946afadbfe0bde95e6a270d72729895a1d3fdeee176d03f SHA512 145fcdb28059147b78d60bbec838bb3a6477b03227fae9b5b634c1dc43d8df31c79bf14b7c0b46211883e8ad060113a826fab0b6d616624052d86fac18658162
 EBUILD breeze-icons-5.95.0.ebuild 1127 BLAKE2B 7861c9b5d46cdca584297b6817469e48eae32a1b9d7b99b4d46bfa57ab114c8a466c39c6f8a09a90c3cc0d05b74ec430b211e790642d94f8d44ec7ca26d8dd41 SHA512 6b867525d177ea8e3160cbdfd437f120b1454d5ae6c2e763be6c7d91054ad41e8abfe82ad33efb02eb7f3c75beb56d1c029af6b068eecd1f2806ee3e833fc2b4
+EBUILD breeze-icons-5.96.0.ebuild 1127 BLAKE2B cd9f3b8af0f662cea1f04f587bb312fcd4ca543b14fd5f64490d79f8ba7232cbae173962914fb8fa61a0c32496a83c9f3a16792081f9d845b5199b882e056880 SHA512 24fb4d003facedd638bda811b0447256d5527811e85cc37f8da4dd44ad56ab945df019ca1338599826233fc3abaceaa8adf271b21fde8a978967897988c6a8d2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
new file mode 100644
index 000000000000..10d9582d90b9
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake kde.org python-any-r1 xdg-utils
+
+DESCRIPTION="Breeze SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-qt/qttest:5 )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	dev-qt/qtcore:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+
+python_check_deps() {
+	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 770988
+	find "${ED}"/usr/share/icons/ -type d -empty -delete || die
+	find "${ED}"/usr/share/icons/ -xtype l -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest
index 60ac28167956..f484aeda5425 100644
--- a/kde-frameworks/countryflags/Manifest
+++ b/kde-frameworks/countryflags/Manifest
@@ -1,6 +1,8 @@
 AUX countryflags-5.90.0-standalone.patch 1953 BLAKE2B 556973d44e147efeecd3080fb8165c00e0f9cd3f37933d9761b8c5c5fb7549553208e44a7b121b78813a64937a44253446604d3a038dff7d0e59dc1fab65ac3a SHA512 13f8883f955bc49a75d05949584da05b7886bf280e70d3808e7fbcaf02f9b15779aa4b6a0e3a2c3372d6b801d415bdd7fb9a8b169bc381e541734343fa74c3e8
 DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
 DIST kdelibs4support-5.95.0.tar.xz 3652484 BLAKE2B 1e79b801274ec97352e49aafae391c130e75cfb6f7c66320dc011cbb318b8739234d9bb9e0e3aa33a96e5335ae6fa99dec823552bf6124f231aa48d2a6264bd9 SHA512 28a8a78f61eda609425acc3ef76dc804774d1eba5eabf674cab9abff8fb9ef3925bb71d0a97a13eea4e578f66996660a0bf19851624ab239826dad5de2fedf14
+DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d
 EBUILD countryflags-5.92.0.ebuild 555 BLAKE2B 5644bd1b907b71b8feb6773e46c69c59da5d5f655cb89c166bf14f094983f77b9272953882c6cbb89a6ed3d4dd4229d7301c2d157bfbca4cece72a1f9789b1e6 SHA512 5a8b5e153ee51f2554cb738a7af07e9393e46224f38b63ff3b0e76b3282e08979f428796a8d22c8cd6e8e5a36f3a0c9702be32625c245ed3e1007fea8ffc62da
 EBUILD countryflags-5.95.0.ebuild 565 BLAKE2B f48093d889d3027a091d62d5436a414959327d9b209acb5b3c566defc13b0895efd8e53b0a9649b531b1521af8fedfb89b9e7267dcf78e3cd24077c2ecefbab0 SHA512 be7c50864353a7fb2256b0ab5f557127e06d1683974c57e8c98d56aeef25da00e90019037e138095447a612bc5ed06ce5b9cd2b912a2652a25b9173512fc8948
+EBUILD countryflags-5.96.0.ebuild 565 BLAKE2B f48093d889d3027a091d62d5436a414959327d9b209acb5b3c566defc13b0895efd8e53b0a9649b531b1521af8fedfb89b9e7267dcf78e3cd24077c2ecefbab0 SHA512 be7c50864353a7fb2256b0ab5f557127e06d1683974c57e8c98d56aeef25da00e90019037e138095447a612bc5ed06ce5b9cd2b912a2652a25b9173512fc8948
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/countryflags/countryflags-5.96.0.ebuild b/kde-frameworks/countryflags/countryflags-5.96.0.ebuild
new file mode 100644
index 000000000000..dfa657e82a70
--- /dev/null
+++ b/kde-frameworks/countryflags/countryflags-5.96.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+KDE_ORG_NAME="kdelibs4support"
+inherit ecm kde.org
+
+DESCRIPTION="Icons of flags for various countries"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+CMAKE_USE_DIR="${S}/src/l10n"
+
+# https://phabricator.kde.org/T13722
+# https://invent.kde.org/frameworks/breeze-icons/-/issues/1
+PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" )
+
+RDEPEND="!<kde-frameworks/kdelibs4support-5.90.0:5"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 6fbd672f14c4..c028144e3fe2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,6 +5,8 @@ AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecf
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
 DIST extra-cmake-modules-5.92.0.tar.xz 329884 BLAKE2B e2d6bb7ff492f916f2e276faf452c2b02adfed8133096cff17c76992d11255f93a55cfc8140dc1b577facdb03cbbcddfefcbbe5242a006aa4c5786a0c64bf329 SHA512 c4adc98a5d3ff0844165fc5f51f9a1a4ff04ef8e8d8b87b87b094d0601577c239f87f05dd461270563d5160af7248ee064984275223a48e931b1761450dcaf20
 DIST extra-cmake-modules-5.95.0.tar.xz 331364 BLAKE2B dc3398aff741ef6923ebc287bff0c2de16a0481c7e6a666f4712db55ccb71c47cdcd2a0234d9c095b352387b692c8a395355b34de581cd44a6e57c785d6bdc17 SHA512 b99cda146c4dec0c21bd558d6435996aaacf3db819f96ca16a0344d8da8dd30bb3ff37aa03f2ac78c4e5da6b0874844fba2bebd24015a804ba985c93c924064e
+DIST extra-cmake-modules-5.96.0.tar.xz 331584 BLAKE2B 7fc907d9feff750d45c6ddedea223ae632d4a70b437df8f9638e6e7ae08c0bf0422ec2696eaea1b1632b472aef50bf71cc3e9e559d9206828ff3d425dcb308a8 SHA512 55625f68453c88b2a5a8ebb6b8ab0b480e9c3681bebdafdf66816499e38dd815cd919bf15b16120be0a2ee8bf50fb3c67e2aa1d652083639ed87fc7ad8c2f705
 EBUILD extra-cmake-modules-5.92.0.ebuild 1818 BLAKE2B bed80d21fa05b767896265d5e7648d60f5d85a4bea47c2f3c351cec09a43e84404488339e4af4b4027951540d840f4f02027e504defb070567e13938e0d498ad SHA512 c85253481df5d7edab33e4b9b979fc8ca743dec3491a53640d0ddff2de64d3c72a5436c5ec5c7377495ba3f6eeacb5249a9682478d5d274db3e5ce8361122fb5
 EBUILD extra-cmake-modules-5.95.0.ebuild 1830 BLAKE2B cad33b91032d3bb12b87939fe56deb401597a13b1bff6e2758af432154b83f5b2505481149979023c16b485939a76512446a3370de40eee8852350a7bff00612 SHA512 16f9760360c3857f77d86e1408232230ff753983d94e6aa29ca45bea3b2f90eabae697f05e6391f1147b0d1c0260785e4f3695d5979621bf02f69724ee043fb7
+EBUILD extra-cmake-modules-5.96.0.ebuild 1830 BLAKE2B 39126a5258049e76b5c8abc9ce8bbf1b2052cf72aec324b0b934095451d1ce3b9df7b67037af08c7932aad1c373549c9e15a189cd31858ae20f9a37171aa8074 SHA512 0859ef36d34fbea0e304e80520c7fc10a4822f3d7a27c97ce11260e7317d12ef08c8dc7008dda63db79b9a41bc46437308164244cf140d4bbb16938c7eeefdbf
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
new file mode 100644
index 000000000000..d249cbab5501
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+QTMIN=5.15.4
+inherit cmake kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+	test? (
+		>=dev-qt/linguist-tools-${QTMIN}:5
+		>=dev-qt/qtcore-${QTMIN}:5
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Requires PyQt5, bug #680256
+	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
+		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	# KDEFetchTranslations can not possibly succeed in releases, bug #764953
+	# possible race condition with multiple jobs, bug #701854
+	local myctestargs=(
+		-j1
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
+	)
+
+	cmake_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 7e7e1dc5c29a..2652ed3ac9bf 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,7 @@
 DIST frameworkintegration-5.92.0.tar.xz 1758268 BLAKE2B 7f72908f93158f42c2e90488aa037bb7dd9146e333b504a9034c8b5c6898fb5a6357a62fc81c237f8be9b854d05c97ce4352d28aa4f28ba1674d26b0098c7e41 SHA512 3445749f4ee10493a798433a7b5630dc22701c98c3f81c7e2236cffea9f9576ce8123006e5123698e5d648771ea77bff848453b188b1a6e791aab08184cebecc
 DIST frameworkintegration-5.95.0.tar.xz 1758292 BLAKE2B 54588bd57289f2b42dcadc230257d031345b0d0cbce5bf674547431b654be418e209aac2692e693e64c86175b0a08cc01ad97294cad7dfcb65c918411d47e695 SHA512 a6fbc2bdeac9a3e2aecf0b6e2bfa0169b36e02d03665758230abc2497015a1540d33e58cb0283ec8333713debb58289deb423a679f726e041ada2d325833d743
+DIST frameworkintegration-5.96.0.tar.xz 1759604 BLAKE2B 24d4806432487e35e01645da97195f700e086c68c6d2f39e7e5e86d00f10a982224fff2fa2eb7d7808fadad4d7524fd2318f67f8d47759e2533a261aa8589470 SHA512 cdc521ff7ba5d3c37d239fb7575a8c1e5b66b1bcba9e315da857b3ddd25b9a7cabc3dc0338186b23b9606badef7c7153c117b92618b626eb54b95c540cc2e680
 EBUILD frameworkintegration-5.92.0.ebuild 996 BLAKE2B d2f05b2db8e364c0da4b2b4e007df850778ef1d771f5ac98b631237ea2e434347dafcac288ca9dc1872b6382bb5be54ca9a71367f35db26a0d37e287e1d880d0 SHA512 998406eadf4c6218e2984165dbcc36667b19735440f9e11e581dce33251d11e861e60328a45b1e44100b2c8e07d92e59837d54d80f452972b06694ed1bdc5113
 EBUILD frameworkintegration-5.95.0.ebuild 1006 BLAKE2B 6818de7ba56ffdc02242eb204b21501a1c492308f08cdde4059178638e064d6beeca5f72da2a7782267417d7f34dd1c14c963cdd80fb0702a43fdd15e570568a SHA512 23e15cce9482d6c55ed18b4771a79a72f70e1393a70bf8c83da6a064f73405aad1ef254d90a3e3e2bf2656026d6304dd73dd02aab8a51d2306dff1208c73e8e8
+EBUILD frameworkintegration-5.96.0.ebuild 1006 BLAKE2B 67478b730b9636549f9f14a093f9e1bc547324a14279bc4901f7dd8ed08bda288ded1e5eb7e340ecc11ae3cf5500ef3426f462e6d67807d7b4d0350380dde2f8 SHA512 110efc2051a25a1d510d7e6fec9b66b30cccb0380004edafe260339cf2107f6e8921cd056cf775693994a76d108332c2b4bc13f681a524b8582b8cb6e312f648
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild
new file mode 100644
index 000000000000..e496a1e09d6c
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index d7d0ab1422c2..1c90199fa95b 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,7 @@
 DIST kactivities-stats-5.92.0.tar.xz 84280 BLAKE2B 958d9bbe6a5fecbca7e31f8bf481a198790f80c307842e8c594613d9117a583b04ecf2f6104fd20a922c6c98342bd80d88d2934141448af288a86502cc70224d SHA512 5298f2390942ee71270ba71201229de7b4e82959302abcb45b09c39d0da5f9d9edb18d9e7d6e9fcc9c3fcef0c4c02ea7f3d96bbcec1885aea899e0da9b4d6fa9
 DIST kactivities-stats-5.95.0.tar.xz 84560 BLAKE2B 632464590d67c446d368850988029f8fc40184d80182bd396efb3d62fc5266b82d9bd2eb9d5d2599a857b13ac5934aa953cdaebc4f9e9707993945eb310b0b1d SHA512 6521afdc80df8d3d4612ca220461e750f992b6a7ce2700efba8fc9e3883736a73c6707e036c63b625585ab59c88266f1115dde3578ba5a00625bb48366e1cbac
+DIST kactivities-stats-5.96.0.tar.xz 84568 BLAKE2B 59d72ad9b0222606230d2f4c787e6afe7c52c080fbf7605221a3a85b906765d6de5df2fda5642abcd5505e1393c2ee569822337ab45f2d1dcc98be722fda5500 SHA512 96c3ca473521a4a00aa06118dc30adb8270b57970581c2c19e78baeb2f93ed6814713149b71e31a46e2502a63716aa06c6fb4d6b2a1e8d924e3092d66c65c0a9
 EBUILD kactivities-stats-5.92.0.ebuild 533 BLAKE2B c5bbd696b246abf738a75126e51d7822273cd095800493c6cb8e5b2733705b93c1d8edbbe12d12b1cc9ace957ae70e9b4f2336d2b5a27e7d09f7c5ad6cb90ab2 SHA512 6a734cbdf67780fc97d2af9d0f46ee0f22b7d064dad7788439b7c3522171084bf6065d706acb5f2e4c2809eddbad478be18479f0a074eeb4517468d6c6a28a99
 EBUILD kactivities-stats-5.95.0.ebuild 543 BLAKE2B e55090ee65dfbd6a93d18d38b4cbf75713b0a5ca03898dfbea6a88c77232494a10f8650b073f2beadbfc07c2806eeb9e23e339575993c818c1b43c5c37cc7da9 SHA512 1122d54117bf953d7554fdc050076361aa641881677ca8080e54d28a5c3843cf5880b98a8107a722f00926c544c783c0bd600a431baf5489a42ef28a4c9a3ada
+EBUILD kactivities-stats-5.96.0.ebuild 543 BLAKE2B 70c5fb3b805237938eae17b09824c06e8a388b00aa8b1a6269ecf05c6bfa529416853b5b93a45154dbf69b7206c79b21649a8fce19a04d8ab519e8859d7a79fc SHA512 3823c51dcefffd2c991bf3702a15cbdb6bbf68791a0c09b48d2282bc882c97ce7b0b97f3c2643d52b2b70014922fdf83311aaba2c8a69cd6a0ec3de53c7da24f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild
new file mode 100644
index 000000000000..b8d9d31f2067
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/boost-1.54 )
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 583289290695..368361124ff2 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,7 @@
 DIST kactivities-5.92.0.tar.xz 73784 BLAKE2B 1f602226a12328de787836d3b158a5cecd792ca429f62fcdafa723576f5b6df74dcd2858cdf11c6b40dfef7f9e2dba2616a4d3e2cae1218b690961b2fceca1cd SHA512 ff560ae0554342bc6e86b556270ce87267c8ba9f01b931b8fd9012e9deb5202ef2c6ddef18edf268f0eada651c0ff6e27d83876fdcb6767d1ff9fee6155bfdae
 DIST kactivities-5.95.0.tar.xz 73800 BLAKE2B 1366fd6bcff50871b27a15b2bed8a6bec9cc3dc4061a8129b644c9ae338135325c280af1caf2e4424f3897caeb03b381e1a6fdbf8f79c8dd6be1109a766563f1 SHA512 aef78d9b30bd69d592b441ff6b7e5eb19c29ad63bc0b8841b9ccca0381e3a859375ad9d87484079ec5b498db1593632b518a3860f5e4e139bf638e0738663098
+DIST kactivities-5.96.0.tar.xz 73816 BLAKE2B d1af0702bca84d9e734d58a9ef0b7d6992f2a0d0eabd15cad86bd82a6bd3b2ad2696509aa05674ab7a2cdf68889f248e12163d1c532f32085f04d441cdc0634d SHA512 4e820ea8197c286e7c7628850b7ca64679b91382a99f1013bda75ca071a13a8292b2693365c838a4853197b29ae9f1f6fdc636c4aa08e5d8337454448d8fd04c
 EBUILD kactivities-5.92.0.ebuild 686 BLAKE2B d1150046c70105ae0665f73fc5802690964500a9346cee24a43034e218cef079fdeb2a6d0d9ec96333bf929afdcaf1b1bf91baf1a9ee38dfcdd9508082032f06 SHA512 355f779d3ef8874528eb124cc24a5755cf51ec9f469b7f882868c071a5b6596811b51ef6c02155ad620b7971f7c941f1d434e88c765c2d9a36068b5f76c9835c
 EBUILD kactivities-5.95.0.ebuild 696 BLAKE2B f0b318c24fbd7946214df8a7b0540763c2aed54d13931e0595978c71c506d0d49341ece72338013e9bc70e5f2f429283169fa36d420506f9ae799497f6e5a699 SHA512 68c8e5b0fba0d3c08d4ad0a123c2a2db8d4d543b8f289ba0735a3d9b1e0ce219f19c6d7ad78f7391d90d91f91dde2edcb138c8b12b18429f6d686ce0a142dbc5
+EBUILD kactivities-5.96.0.ebuild 696 BLAKE2B d6a4fd0af2410e2b29ccdd14c3b17f650de52ad4d55cd69798ba0b1a90a984ab4ba9349e2a899d978ab27d1a20a4a1297f4da396e4b2e19e006705bf8c18525e SHA512 0ddf5072adc3d563d293b4491dfb7de9f1050b62301cc2c59c05dad6d843ed219fcb32833693efdbb8963be3785240997a20dd66465e805ce7ca1bfaa2a8f176
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities/kactivities-5.96.0.ebuild b/kde-frameworks/kactivities/kactivities-5.96.0.ebuild
new file mode 100644
index 000000000000..23ca374b971b
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.96.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index a280c5e53b9a..d30b61077ef9 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,7 @@
 DIST kapidox-5.92.0.tar.xz 197232 BLAKE2B 08e616fb0a4bb21f0d747ab571401121e81203f81ef96cb2108da84e314c03a8e296507ec025a2431989dc443dceede146a26749e0789f4d0d2048966611f088 SHA512 876f8f5a1e7db8bdcaa1a6e206deb9630cf35ba6e8f0c3616557ac95e28b8a9b2c7d40abbc22c19abbef3e310070d61a7b71a03ad62d32d75f014d8ae7b2ce37
 DIST kapidox-5.95.0.tar.xz 197452 BLAKE2B 7b17dac838dc948019125501e24fdcb10816eb0f66ce49f37612c87f48a03058f73a233c84d1dcbe685764fdf6487f8f49620537b76138ebb4c240fbbb0f739f SHA512 876cf28b88680b4b027edb6603e4de12d7554ed9b8eda40738259550e703f53bc2465e26fa84a43c68b9d4a3a98b202b4c76033b1df6c9422e96a2aa7417e994
+DIST kapidox-5.96.0.tar.xz 197492 BLAKE2B 05c5aa7c9b216a0a2c848b205df95d20f0b9e36929a5ceca00503b9acfd916943b5351193832f13523084463ecc38022a10f5734476e46ecb34c943713a5d853 SHA512 40b33c28b92af472c7d8e8150bfc43328239a6c9191c687713b7c017b245ef3d223e77b64278a0bb312770d78627072a9291309f8272f97fc257214862b10737
 EBUILD kapidox-5.92.0.ebuild 587 BLAKE2B ea63c13a95102632de011791cb1f7e527412e5cadb51ce39c98c0b4e1aa79b004e92cea1a7ed0af691ce35771d56254bba3301734db416442b17fa61855f67c4 SHA512 a81c779be889d3c680a5fdbe8c8acab15f7a4ea22d0bf53bebeae0ea05b3f4db8d391f02e55fe2bb3f25ce4ee11bdfd0059a0e5e802a6adced3c09ec44cdb806
 EBUILD kapidox-5.95.0.ebuild 590 BLAKE2B afdb7be7e1928ff07a2c8c97500bb0810e4a0fd5f21081eb4938a07a56bc78bc46c79945be3106bf24ca3bda64bce549869ff7d14bfdcef1b0b5e71c24de354e SHA512 83001d034fc3370a38cf149fdb6425d5b4a012023dc10d67d3a9abc355d86b06d467172913a7c4ef96563597b2da586751835d98cd01f3aca149fe9c14effa1c
+EBUILD kapidox-5.96.0.ebuild 591 BLAKE2B 0441e4ad0656a281c092b6d118be23b415309e5ec29e1895a9090acec8dde46a853c62cd0ac3fe814e93bcb990005f7d5311e469f9079b6f6e62f4fd315cc1f5 SHA512 af32748919775269b4c925b0f603bf623dccf2736fdcdf4adb7bfdc8f4de0d8fb84c217926a590347c5353dacb4a00df9dfc207aa3b1409be681fc564e842a03
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kapidox/kapidox-5.96.0.ebuild b/kde-frameworks/kapidox/kapidox-5.96.0.ebuild
new file mode 100644
index 000000000000..3f8ca96ad2d5
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.96.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="true"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index f67af0f92020..3ae226944c50 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,7 @@
 DIST karchive-5.92.0.tar.xz 986308 BLAKE2B 5b549f6130b79cc76c817cae3fac6024724fdfcb207d5bd586b135351b1b07351884ddc0edb7331f595c40c964ed70ad1ee1892473e56c74d76cb636801221f8 SHA512 c6375c14805470e4d61142a97871d5255769f92e3d3e9716218d3b761c464b4e0443b1126b57ddccc33fe34e5d63c7468fba1d083dca49e2ae1dc38d583db770
 DIST karchive-5.95.0.tar.xz 986628 BLAKE2B b3bae715012207477a4ff4a91e9d7c5ab8c0a0b76eb7baae00c3519ac36ed598cb707a3e6439c67b7975ae7850e3f12528e76d13c3db8cd61d35054ecd2a6be9 SHA512 b628e793a7684c107daaef0cb9ef57145b7efa3642c4875f028b50b0f8ba14f1d6019c55f99f38b3d786fd5d9dc671cb6fd2601975819a0959775763fdba7b15
+DIST karchive-5.96.0.tar.xz 986668 BLAKE2B 6b32a69bcd98115b128e00763130790139cfbdc2e09af5560001e4f9a7404915d53e3d71c76043ae1ddbcf16996da22e4e433a8579aca4101a9ebb598128604e SHA512 9629cf22ed761f37a7abe60129ed36c1665ba8b8ff6497ca214e4b88a84b324def9acf48d680300250ddc25e246d013d2bdc7b2452b2718eb0584fb55d2142ca
 EBUILD karchive-5.92.0.ebuild 634 BLAKE2B 70616ba9ff196bee4cb5a7f7e523a752634b79fb0e6d9ddee31001a171186c259e174a59cfb7962b39f79a335fafca722008b957e44ac57b31b274410b96c090 SHA512 f4176e306622529fda64bfcd646a6e1e8d762c1b08c3bd5562cac8ffb4dd736bc62e6e218d503f67faa938e9dc24b88b8bb8e8fbb6dfed423cf12d323b66d630
 EBUILD karchive-5.95.0.ebuild 644 BLAKE2B 58d5201f520346335542d67019124895b97a5e6538b1dd52e38863cf3185305da9cfd6f01562a9df494f9effdad38d07f47972f4a71788b9a0dbae924b2f6661 SHA512 590fc266a178bb74672b0d151c613abeba32a5ac7c6d33ec8ab506b56d7a2dfcf83dfdaed5ca6aa28f44650d13ae59b856f281c353f2372ecd553ef676684df6
+EBUILD karchive-5.96.0.ebuild 644 BLAKE2B 58d5201f520346335542d67019124895b97a5e6538b1dd52e38863cf3185305da9cfd6f01562a9df494f9effdad38d07f47972f4a71788b9a0dbae924b2f6661 SHA512 590fc266a178bb74672b0d151c613abeba32a5ac7c6d33ec8ab506b56d7a2dfcf83dfdaed5ca6aa28f44650d13ae59b856f281c353f2372ecd553ef676684df6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/karchive/karchive-5.96.0.ebuild b/kde-frameworks/karchive/karchive-5.96.0.ebuild
new file mode 100644
index 000000000000..266a1a4b183f
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.96.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+zstd"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="zstd? ( virtual/pkgconfig )"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use zstd; then
+		sed -e "s/^pkg_check_modules.*LibZstd/#&/" -i CMakeLists.txt || die
+	fi
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index da196abd0679..bc7e3c2445c4 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,7 @@
 DIST kauth-5.92.0.tar.xz 90132 BLAKE2B 848d5654a95006c6ea4529be4568ebc6f3f975b87ffcc778730e0f7c67c08462a3aa5e3f9443fb31e173fb61d38faa08759bdc2415cd72f77ce7743a5bf83a6d SHA512 1c89f5668193a70cc1e74d5b671584d5b2fe003d6bbf9136933a6fd93c4516766a5e2369ac80ea78a0ae3adf4a454ae4be8558e06eeb34640779a9c7b645a244
 DIST kauth-5.95.0.tar.xz 90856 BLAKE2B 986a7558d9aa8e718e72ece197614d7bebf0715131968c74a9a78e76141793590f6b54d8bfba0becb8cb9b3bfe7ba73f9acd563eebf31be744c9a4f9c6d03604 SHA512 d15fcfa0970e386cf34786a17eade0c2336668b192eca4ae358db45252a56714f45ba2c2baa87a1c0a51640ba695543c96df242c138f1195dbb5d5ac25352d45
+DIST kauth-5.96.0.tar.xz 91188 BLAKE2B 12bb41387cc07b63bb33137746a1482058335505008b5b6759e51b5be1b1426cda55004f1378dee752302dfca73ad3feadd69d20c85ea9d35566e3f222997366 SHA512 ebee1ba35b3dfa439b79c1aab6a51ec968837253e07e913edb4813214744427baffa5d2be661d66f40c7c25b09184dc6dea1773854caede1a263327d9f582204
 EBUILD kauth-5.92.0.ebuild 913 BLAKE2B 32484d158de6249fbd15209669fa968105b2f8ce25e501cfafcd26b07a6fb85b3f849b9a81fdd705b1a30660a15c3ab52d721727ec8edc95432311d1ed2a7463 SHA512 7a3d675716a5596c719713f8d55b4ed4b4fa42f9b4b8b83114176fb8ca238390f2bb9049b6be8c4564e6687672fa6ee29c4d1bc3dbef53d1f86367be8b9475f5
 EBUILD kauth-5.95.0.ebuild 923 BLAKE2B 06c588c8863ec2cfb618423032e93e343186efe841a7d8013e994a337deee978d6857c00b153a80c7dc76448bea54ea6f72bd0459d2437316ceb01c47af617de SHA512 1a7ddd1f83d4519a0ad54af6916cfd72c01c3b35bc61293ddbe40b244f20d039ba693536baddf5fd3b13666744371eaf11d2bef3500ac595882a59838edb727a
+EBUILD kauth-5.96.0.ebuild 923 BLAKE2B 9919dd4c5adf24cee7fdccec93f8ad8e677897eb4f057bc13a2b403275890a0cc8c2f0b92b210b72c07576b0284dc0f322d7bc53fa54328a3ddf7126e0b78cc6 SHA512 85965b4e126741472867bee5bbacf5ca84f2d2899cf63b62687cefa47ef8f56dc68eb4c9ef84d39484de2158ef151191eae7daa072373f7854d8b6d10acf4f71
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kauth/kauth-5.96.0.ebuild b/kde-frameworks/kauth/kauth-5.96.0.ebuild
new file mode 100644
index 000000000000..03f6b52d6f33
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.96.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls +policykit"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	policykit? ( >=sys-auth/polkit-qt-0.113.0 )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package policykit PolkitQt5-1)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index e1e34783b729..0b4c66bb0841 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,7 @@
 DIST kbookmarks-5.92.0.tar.xz 130288 BLAKE2B 191e916e4e9702a97ef105bd2e31ba4b2cb222d0dfd2a26742c8ec9f296c3f1a26ca7406fff8984aa90cf63270bec4348b5fbf90720287e6c2dbdd0c2f0c1323 SHA512 c5cbcdf1476b9c3f5285893469d6543e12ef3172312c12f04728b48a15d26bf7cdc5181a5db91a7aac2dba90c088db8086a25436614ca0ca04a000705b2198b1
 DIST kbookmarks-5.95.0.tar.xz 130160 BLAKE2B d6ec78bf44cae9d9c4c1364a84300e4dcbe51e3032f594d07246658b39cbd6852e2593b8ceeaac12a796c2cd5059ec19145670162e8519996ad4089744955f8f SHA512 67102385cb1ea552254fbcc5fb863eae13f938794fd21355c3e259e07a277a5ad296ca6c9d650538db8d0430e29c7524654088374aec1a73b13bd5f3a5ded4f2
+DIST kbookmarks-5.96.0.tar.xz 130240 BLAKE2B e1bd5d95f118e15ba0ab014e4e06ad77f38c57093f92b18959eac57f5eb4186831986e8af13c863893a4168a70e48bba8bdb9a88b0372e68da2c32b45c023a0d SHA512 031c8f7cc0ba51c1c222983f8200ac0bf2fcbfab69cb43ca3a6cb865c70e53dd9b090969df55dcec778be3ccec80d2e13487f6cd2c0c6f8258316ea04ed47cce
 EBUILD kbookmarks-5.92.0.ebuild 823 BLAKE2B 4315f733f650f94caa565d12182d18964abcb74d1c971611307caeb6cb2804795d7bcbd06c550d9b67e882d73e611b5f660d45aa5e259dee271c6bbd73f09965 SHA512 7d441fca414d81f3b57a981579c8d4cc5c32a13a8ee389e3d2e9ef4fe12941a24985d34e5749f935435ae5e44c727ccad42b755ee8242e53456748d53abb6035
 EBUILD kbookmarks-5.95.0.ebuild 833 BLAKE2B 79ad8fcc7317278d27e4233bee445cc493bce27a7a6ac7440573e22972f1c6ecbe9f54992ba0ed82638cd892e468e03e04e39b2551dc9b8e9f0f15f81913b0ab SHA512 181b20ff1ebc3f7f64225ca451dc64493f8dfa10a3f4ad69d4d513ea98987e9a22ae5cf9d61a0aaffec4f73e95363ff81b61da8766f97e5f85a6922f38fd700b
+EBUILD kbookmarks-5.96.0.ebuild 833 BLAKE2B d31db68e8d6c6a9dfa3a135bd455ed1c7ec718e6701e894c279329bd9ad934399bce62f7824f205a32b737ed1acbacc122c736c87740efa1e364b4001212ca9b SHA512 610323abf29ba7c9a2f966087c60e68400debedb7a6b432d11a12794edd1b16c67d8583c7a9a05f6d0fb0ae1f89f2f61017ea139ea6e3518a1c16865aea6194a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild
new file mode 100644
index 000000000000..d2ba1e51132a
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index daf67fe8478d..90e7c0cc0546 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,7 @@
 DIST kcalendarcore-5.92.0.tar.xz 263032 BLAKE2B 1b3f07a6618537bdbc7ec62522a4cd852292d8cf46670f222a0b2a978234c8bf898148cae7a64609d41daffe1f053351a35727ca3f126b76009277db4f25a3cc SHA512 4efb6fbd6a3728648a23d608af4c4732402fd133911968b103c4b34876ee469e4680992e5d5755b8a9892ad60ed53a33f6a0c4c95418122258faf5299caa5413
 DIST kcalendarcore-5.95.0.tar.xz 264080 BLAKE2B 9f5b9321e980834d2bf723cc9f87a90eea634dd8337530e83df8a6ff3c622af56af297d37cc6036b24b8711c1bb4dc611483a1ee6db87d85eba74246b1515ed5 SHA512 327e2cc9b5f41c38b5afad359c047e3a5c4151bf7be065641ff801abfc8fabd508ecdc1ddb1124484fefe2ad9e7196c7c8a90f5e3227e3d938be78f22bb014ba
+DIST kcalendarcore-5.96.0.tar.xz 265908 BLAKE2B ea3bfa22339113679c7d99197ffa02273e98f8f717b0b75fb2dc22ad332e1c19b5f919601c535d504e485fb0b03d4b33a40372fd3c837d61acaf77acaf966833 SHA512 91540c29b32b65156d62a5da4ce2b1efa62232de917866204d2d709b0da41234907af0a68e3a4a434d06cfa6403897b9869345018fc5316e7034dd4f29f133c3
 EBUILD kcalendarcore-5.92.0.ebuild 498 BLAKE2B 8f61dd20b71aa1e3869b037ed1cc49de786561eb1ce42e68f6fec09e0f98545266bc74abb36e1c2eb69b822db5ee84a496112e28535d8a5e3914bbd7513c7858 SHA512 5c7d9b6f07183e9dca47089bf019d49667f0fed79cb0f97929e5f2e156bf1ee2baeec52b88a5d7d15f5478c0a0dd43b7f5a73c122c505fe10a25b4931d6fa256
 EBUILD kcalendarcore-5.95.0.ebuild 501 BLAKE2B d5362bc82edebefb0502e4f787fe769075166055951a89e3483ecabbe749395856c0eea7469fa77ee50d2797ff3f28d4bd70a5489131da1df0ee02e61f139348 SHA512 309f13d282b0e2cfbc0dc939be3ba36cde7ef926f0b4016e78e516cfa1c1be2de089cb638daac609fc30bee0e1d077d4eab7cf579f5a62f3cc67f267f68e6c21
+EBUILD kcalendarcore-5.96.0.ebuild 501 BLAKE2B c7ce307af63c2fa7458ecd31325ba2c3ce0a0a977f961dfcbbf8f2e18eab06e611265839fe31b81f80d0691463a97f8b21536ffc645e4ea630a853885e142022 SHA512 6420e7f5c03db256a0e2f3c69e7e4909408f03bfc16310874066fe5b1bd9913ac46226143f6e4791688d22caa8ae5ed6b7502dd7e3dde9c8a6da862d22719ad7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild
new file mode 100644
index 000000000000..80b882aa7af5
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # multiple tests fail or hang indefinitely
+
+DEPEND="
+	>=dev-libs/libical-3.0.5:=
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/bison"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index edec57409e33..2e65d21a9fd1 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,6 +1,8 @@
 AUX kcmutils-5.92.0-KDEBUG-444378.patch 2490 BLAKE2B 5287389c76d78ef404d7ba5b3766a0160175be996b36bb2014cf01c28098167c057aa9ee097eb38e918c9d270c354c84dc015a0044f3badf2b87c46904c47c8d SHA512 4a7d19f8c214c914cf25119c32afbdca1939a9832a5f9eaee287084afb3aaa248ade9cae8c10bdcbdc6d4ac79a794a6c2e253c658c3f2fccf973d960b603085e
 DIST kcmutils-5.92.0.tar.xz 172120 BLAKE2B 221482f15f1c8138f60565215f5c0c2d6e9922d82d81d3a90a1685f9e7a9407e459d56dd5e91a8dfc5b6dc322ec012a15422d265ca0cfaff54a8b7effb1ba0aa SHA512 b0810f87fc7b641ff05ae8b9816434175e494786ee86201a34bd435c2177e6b8dd963e60804747cec954ca7f02d54bdc7f944b72c0a774ff4dd86b186e9e2f8f
 DIST kcmutils-5.95.0.tar.xz 186024 BLAKE2B d0dc561588556c0b2e4314fed774c50cb87e58766c7429c9ae5f2e3c9de9a18d71e285a88ba724e3e33335d19d63849c3508db200b23525bf9f2590161bfb8c1 SHA512 655e6998206b62a642bb3cd63205e1acb3b13e39cfc122f1bc7a814964b89eb932f6fce822be6b0f9b45f28216102808bd5cac3c9e56040f68bc1afa17ba3152
+DIST kcmutils-5.96.0.tar.xz 186272 BLAKE2B 6c0996883d36431aa3bed2b6c83a8efef8791fd3d347d773e94a75c390c060ba3d0ef92eef8dac8902c9a734b9a348fcf0c8d912f8d15a316e2fa282921ace23 SHA512 75470dfbd9191f4ccdf8cea9078486c708135ff41407f6a9cc3c4d2b045501b36b3e874761f322e82eb052f806e3bf8ff1263860a36e7678e46a580c2413b0b3
 EBUILD kcmutils-5.92.0-r1.ebuild 1001 BLAKE2B 44d9f078cdaeb031ee73480439a30dde531e461de2c7bf45fb3120ca4d915f3a2561f67eeeec9231b2486c23dd01a6a98779ef07dc7f992cc59df4ae665e6c84 SHA512 72a16f791dd1070a880f2115de850aface180e85b5a857c0497ea6a3c5e7853cfef2240ac361e3db2bd4d7a864681d785d8cdda71b327c068b2ba9a5e2a34031
 EBUILD kcmutils-5.95.0.ebuild 959 BLAKE2B 0f7212755780d580e41d1191fdb4df192a88af9bed96e4ce8ad770f3d2dbedb136db39f38e9f79537c328bfa42fc2242ccc3e5a4581ab0dbff1e24914038db79 SHA512 7edd1687ceef121d0869cf5036dd71f4bd5aeab8a6da8f6cc1184dd4a23565c60b97bc337f571ee89bedd206aad352da85e87833b1e77b4e4af8bf5a5d907596
+EBUILD kcmutils-5.96.0.ebuild 959 BLAKE2B 3c5ad0931cb17da85045b8d85e420101f53bb1e7d4e156c8049a8a9a1df7d3f41f6ddc0640b545a93f5f771b1b3b09321f4cd53528f205ff42b1c363b3c68443 SHA512 643eda6420a2d4508463ade551c2d28872c75122e160492dc11a73521f987e6341d8e8a775221fbefce7822193d83e31ac33a9d147c55a136c266bc3300e6b09
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild
new file mode 100644
index 000000000000..b6bf2337b6dc
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 5b630a48be25..82067fcafd85 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,7 @@
 DIST kcodecs-5.92.0.tar.xz 236760 BLAKE2B f93d7d9bd01db85206d39a36ce05ea690b51bc11cdc933aada4f346b0c934d68c96ad3c6abc18ab5fa93039c16edf6f9c1dc6ced754906f55c73862c846b06e4 SHA512 d7d89f08b6ec789afe6267c2c9d7a1b259cfd720d3b52a83eab6cea527dde414d509b44100cba9ab5727f10b02ca090cb33038748ea41d21f21aac12b65200ed
 DIST kcodecs-5.95.0.tar.xz 236724 BLAKE2B 3303cd0b40d362c25897481c5e2b4708fdcfaaacbd97411ce8a6f5e8e7e8d5dae8f8a6909ad83fa8d00af89ccac3eb12a376070200c038d5fb809fe9fbcbecc1 SHA512 b802ba6b6ceaae8b1272d7f0f2cc33e76f62de4e35e09e841e94010da25b1acf8372d4bcf69167365f1147a2f356748ec8418bef5a2d54874cd14ff73ab5014b
+DIST kcodecs-5.96.0.tar.xz 237132 BLAKE2B 3a9c9105df830d933ea7ed1e56f11bf3972fb48ca3882afceec4b9fd6cf3dd217dee814d41c5713ee79378f796d298bdfe2d38e277224236ebba4fa58f6a2edb SHA512 24e467fba8c61834987a6deb7b4ffe60691e7671118c6e55cf901660921d8798bca214f67b9a5e8676881aec95d832770708ceca9787175ab5658231c302a097
 EBUILD kcodecs-5.92.0.ebuild 376 BLAKE2B 9fe8d02acf998edc3129714c91ab1b633315105ea2cbb2d0da773988462b1230e527580b3d82d6bfbdee57cac8341f421dd85915e484ee9001e6fb8074206017 SHA512 605f158f9a852ccab0ded0e2a0d826dce99199c316fdc184fdc3d090319f0b1951a75ef975c59860543338d0ab479fa656949322d6e4d69fb7bb91eaf876dc56
 EBUILD kcodecs-5.95.0.ebuild 386 BLAKE2B 670e4a502c4910a6e974ae5ec4061dd326d1b85d960f3b705bfe99bbc1b75cec746c63645e4027109103bb843c29df793f49f3bfd1b130f5081108e06bb8ca10 SHA512 5ea33d28002b3b58c9ef142ee4619b232090d13a93e9a2ee4b549bf850fea747b40dabaac84ea95a8010b1cba0057ca107d91983d31a15663856feb88799f630
+EBUILD kcodecs-5.96.0.ebuild 386 BLAKE2B 33a052df6e0725da544b537318999a95ccdd9e1394bf47aa25af8e887f407d058408b0481afdfd68a697f322f76be72ba142f87d3c10d6b618a9e10976d5b670 SHA512 c38195b34a1e5acff78fa65f5672e2f4ca30e0fddfe409abeb1276024d348a3378d2a2f6f687b2758cfd8ca91e38df408800b7bef51006f0e77bd71a83e1eb02
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild
new file mode 100644
index 000000000000..b522e69b52eb
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-util/gperf
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index d2b31b680e77..382777b2dbb8 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,7 @@
 DIST kcompletion-5.92.0.tar.xz 124500 BLAKE2B da722905cd3f1dbb7c4628ee8957899a116b8ee2f2ebaabca3aebb1330ff44f428798180726d08e9970ab3a286a831c89facc9f9fdd46405102ad13bc1a6c104 SHA512 3253a54cbef68d2b71bd457f240db40be0a590974de95aa6f0f2a5a6c095279f45f8c1b5111644f04039423ef783d0bd0e75fff7eff403c7ffc8197ee9008e03
 DIST kcompletion-5.95.0.tar.xz 124452 BLAKE2B 60c3004be3c5b1287132f90fbae712270a81d60c50c462834c8914d0e9fcf112e0adab5e584eafa48d82d18e141bcd996eab4f43e85b5c376618b14046106088 SHA512 718c6c5d88564e6a50758f1b1c99091d370a4ef572962b0c38446ac57ccf79899002901fb88b78f38f819a6451219a9adb79f045d1c5e5a383d8443473304730
+DIST kcompletion-5.96.0.tar.xz 124448 BLAKE2B ad4631da59558fecd04065cd48b5e3b76d2e70afa7419ca8aa1502da61a961f4daa05ee3a87c562830208dc582b961fbbe2ed68b1a4a4f6a1be457567b25168b SHA512 be7d6f2cc5b58fa476994d6236ebf2e2a3c5071b1cbc33415db3dc9e437d88f5ba8e471b64291254824676cc0e4fe5614dbfe0b64d7fea9de2c8661ea3144c18
 EBUILD kcompletion-5.92.0.ebuild 607 BLAKE2B 182fd71c6961f53755bdd8f2eb8b26ceb2d1fa4842f5cc671d6699de3c6b23b369fd1ce824e5f3ab0bfbdce5c78db519c08160e5df57fd358e63d7349596c229 SHA512 c7199a7fb38a4aae44907f01dffb72484cbddbb117a88bf52dfed54493e6fbd7113836c053aec6aa5ecb66682d44e873345ad8e143f1f18b5617673adc73140e
 EBUILD kcompletion-5.95.0.ebuild 617 BLAKE2B 0dc058a92dae1facefcb06c58496ddab324e79bcf21451bcf406b4bf24ade225b76dafa9e5012a12cc717ed8bd58e6028b51a9dd5e2f425870cd235054164a00 SHA512 d49e842485066216012cd5e51055b0c5eb945c9d419775b35d330de03da79b9188060185afc2413b9da12836e3298693e7ac2966fd4d10186b5c1a10bc1433a4
+EBUILD kcompletion-5.96.0.ebuild 617 BLAKE2B 7eabf30a9f78771f02f242a84d25b01b6c0e5d9155709e484fea237b5aa4d4959ae20e42f27a73dbf1142d7bfa388049647872c74b5214a7248e33f6914bfed9 SHA512 ad7fa677cbc8135f67eabc6bcf4455abaaf3786d17c0f05a492434f3fe842126c1c936b61d9c3215a5bf51c4a78e23a6843f47296713ce0d54f4c1151cf27df7
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild
new file mode 100644
index 000000000000..6de66f3a6c2a
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 4349783ae6b0..435e4ae42406 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,7 @@
 DIST kconfig-5.92.0.tar.xz 281432 BLAKE2B 268114c759f586f305a10da2471c98b7110033646d6e02406e1659e5feb2b71c9f3d6c9aa90987e0710a82471a14129995407918ae873a1baf855b906015e0a3 SHA512 751fed42c90c8319fecaca106cbc1a8797cc1490a3732ca9071dd5ce27bf1cdf3acbc048ae14b8a7920036b47fc5f554bab4742f00c1d0391d2c130a5e0aba4d
 DIST kconfig-5.95.0.tar.xz 281816 BLAKE2B 919dac8a7f0fb660c37f72237543076411cf5c1baa68bd7bf6fb367b4ee76402cb122240f787cf8144c18c88eb03781c27c02bc2412c7a36f899e00f8db4791a SHA512 9e7e7895aa4007dc21dae69802521a19e65692ec4f2faf8a1925d176791bc3b9dea07eedd983c4f846b82d3f38cc82540481af34795ddc4523ae5e13cef283bb
+DIST kconfig-5.96.0.tar.xz 283284 BLAKE2B 8bbe511db0badd7338694c22485c97015c2f42172f72c37c31cffc322ee90aa9940ef3f8c9a5c55a67e5775fd704d133cedbb62fcda8d7df710e3c64caafaac9 SHA512 6eac947ce3392e0863faf7a67f9c161c652fa1eb4e7f508a42dc08ccc79c602c2946fb87feff0e5ac0cda626b1de910abf6218069f5e3910ec72700f7458743e
 EBUILD kconfig-5.92.0.ebuild 807 BLAKE2B 9d958489f754a0978565e3406e544d0e9bb7e508c0140aba06512b6a4f929f9400d5986b1f846dbc0206a018a4e90133d1c4bc52e9d73fd84bffe4920092a43f SHA512 a7fdad74aad6ead3f1a6adb0f89cadde7cb81e7d1d42fcd9e0ad1aab84633561488471a3a9aa33b62f3de1d907425faaf3f4fee7c927706213d36d5f2f60e365
 EBUILD kconfig-5.95.0.ebuild 817 BLAKE2B 00df908a5ae2111b9f5e6d67344865a37ae4adea3410d0d296377eb811dc29a979dad8a01948b9042a9f8b46d869c62b9912ad09b1414356032e311b0a3cd8e9 SHA512 d564f08799b9b90217ab618f49d5a0be8ef3848ca80c9dccb78b65a11b66fb027ad51bd1314b4bfc2ec5acc83804cecd6149f3f9e8af5b389bb32fb950c5a946
+EBUILD kconfig-5.96.0.ebuild 817 BLAKE2B b3c8d240d04bf9cbf086f382e024a50815529846f3521644968b0786768610a867a11b047d08e50fb1a18ee8716a868fb49ae2935f0a393eb7a525490469fa27 SHA512 f81fb2b739c3d1ae4d499bd1642c581f06841aa9c5f5398b8bbc505b322e20983b99e38667b23b4642076d880864814acb6370d9d95c81bc0edd23348cc381f5
 MISC metadata.xml 549 BLAKE2B 174b0b0b8b74df71f930554147505471927697979ceaa9b341570869dab598fe88a531890a743f328d0bed0d24a52c1214f0177a83d04054809ca0335802024e SHA512 7ec84e7319534cf690321ca12251bdf3056228b4d413d01aa9ec239e6196ac7de976b3f431f6813676a6416dc5fce007b8e62fa27602d14426a8b8a2cb6bde4c
diff --git a/kde-frameworks/kconfig/kconfig-5.96.0.ebuild b/kde-frameworks/kconfig/kconfig-5.96.0.ebuild
new file mode 100644
index 000000000000..d7bc26b5322a
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.96.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus nls qml"
+
+# bug 560086
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
+
+src_configure() {
+	local mycmakeargs=(
+		-DKCONFIG_USE_DBUS=$(usex dbus)
+		$(cmake_use_find_package qml Qt5Qml)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index d1be9f5b9e1f..0e0d65c06705 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,6 +1,8 @@
 AUX kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch 1357 BLAKE2B f4d08627592c941fd909e700982a5e7695d373baaeaa5df4027ed97d7f3d214912cecd1bfbd46fc5f84f231a53d52f64db199e62e9daad624921c2ca62ee3dd8 SHA512 1f3c653a42dbec293fafaf44e0f0ca4ab96ac018e42beb6c2527179b4c99f669e3a19b978db47caf03204055800e85c4e83cd61be60d2d01f13de7406b4ece3f
 DIST kconfigwidgets-5.92.0.tar.xz 414528 BLAKE2B 688c6c509577e67558e0d3d080c7b11dc0041a6607c9b5d10d7e057e7c38db57b49bb0e28535a4314f32906d2a9bf55a6b96dc8e064a8775d08d3faf270351aa SHA512 50d07daab3469a3ac9bea2a5ff37b9b1be13bd833a94892825d25f5cd066dc5eb8d44d37319811463e6edc94123da0255851d4f6463ed3c723c6fc69e1902a5f
 DIST kconfigwidgets-5.95.0.tar.xz 417492 BLAKE2B f80dc082c88f85d25e8edd901a8964fc5d068be65dd22d3f4a0ba2523540fcf5cad2462f4ae58bb1c180ad18872ff5d983449e7b24da7da1b7d9388bae189470 SHA512 44997cca8b293f8d591aa7a6478a0f87a5e212cf7609ba8e07b1a8ee5d40852171f01db8732b5ea75088ee9fb266d21ac97a535c8d356cfbbed8cde1b962559a
+DIST kconfigwidgets-5.96.0.tar.xz 417908 BLAKE2B d788ca055f2df23293df53dd38362498c13df206ae4b23dcc36809f018535fc64a1a48c42ef7e33fa1429f2630bcd551060a01640fe5105fa4c1f45d1e2d799c SHA512 964bda7ece8d3455f585ee4aa12bf90dbc8d00c792cff29e0f02be34ebf02daaf540abfef4ce9382592f09abaafb404387dcebff2007bc5bc78b665d3aee7cb6
 EBUILD kconfigwidgets-5.92.0-r1.ebuild 1016 BLAKE2B 921c2407a4db6b585896dc5af37d2a3e096a8653151f3aaa8041d445171fd9dfebbc0b30e3b0e0555d92910cfb67dbc61bce4460a33552158da8231dc593456b SHA512 ff5f4d8a8041a2a7f132766cd597d4bafb9b8413f09f18e0a65b1cd2f902710476665eb92dc200b1677df2a226d59338e6967d7e12464a2abbe895e3961b2b71
 EBUILD kconfigwidgets-5.95.0.ebuild 940 BLAKE2B 21dbde3fdf2e0b872083453ac1257362213c9402339d12321384a8d5df0807b5a3e36ff293b164d7ac5821931b0027712f537a24fbde2e31495863dc9eb62c39 SHA512 22db4a6b4c5dde74ee6ae156b0cfd91644b3b819683ba03dfd008d01380ddb996d5d108a11c94dfee20981b6eb931aed8cae2e17ccc373714179ca1a052459c3
+EBUILD kconfigwidgets-5.96.0.ebuild 940 BLAKE2B a0b12107952fa1198b9d6c65ac134987e3ec38f16fed06989bd1f668132315eadb77f48cbeaaf9cae8d5cd858c5f6176f17a28e09254080da15af8f591e08f3d SHA512 4a5d8838df8c10f040c0579aed0c42dceb5a2f992424f288e8344734681096ce50d860adf93c457f199271c9edb3815ff4c3681a747d50914df341935ef58765
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild
new file mode 100644
index 000000000000..fee0e05e7bb6
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 90a4d93449dc..5263697360be 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,7 @@
 DIST kcontacts-5.92.0.tar.xz 192640 BLAKE2B a1a91e897200cf85dc24d916dfe57cf8e04b9ef1e355fdb915b85f3763263feefa53357a7f56177ad854dac38fb5b71a2b469a4a2930a1dfbd09db4500451e70 SHA512 8d5f08afccf5b01d72a9881ef4805ec2ae8dba3afeb93efaf82b80fc60aa917302681387d77d7f104f2846958077ce7418712cccf677f9067eccda92cfb4b2db
 DIST kcontacts-5.95.0.tar.xz 193028 BLAKE2B 73768c02812dbad25f62764f621cc4c1fd512dad2ed09dee1abaef850002f4531f33e526ca6754e4563e72f95ddf7d35aa201d63d89bcecca3626cccac70b430 SHA512 da0a95270f8c0804526cc396e16aade6408fb41aee2831c57cc5a30d5c6a6eb6f9dea191617001a306984955a581c3dc87d65842ff2ec69d2f1a835b09c37fbb
+DIST kcontacts-5.96.0.tar.xz 193856 BLAKE2B b01fe643f103751e7c6740b23e9de3dedf828d388a009a16e332dfe12cedc7ed37aff18ad5dcc7ab9f8d336e1552a717188a7a18a775675e3a451f38e8a42984 SHA512 0d7b02301389d942a87d3a77a1bbae202e9897ab7cad156e33d9e0a46d7a77d32bc0a9829cd08b4a4d44e073297cd3d98a9e0b00937f49bbb9b3fd968cc74055
 EBUILD kcontacts-5.92.0.ebuild 810 BLAKE2B 26dd07ceda4794f124e17ded59e415ab45c07a326d276d0345ada0ff0cbf831ff56afbdde89d4202a27f7dfc2252502224488cf5bf90d76442e03563df532e92 SHA512 b0111afe2db50474184d32a6fc458a71e140d92c8f1ea96d1bd38da22a8be825289bd6e231e133020b0fcd56a3ca8254357a391438377aa191326e87f2066b07
 EBUILD kcontacts-5.95.0.ebuild 813 BLAKE2B 764c12ad073ff64780913d7281211cf7f546929423b8e0c385bfed5b70f983a418cad1e5c44739e1d850fb1bfdf7d5038d3c37cb7f987d1b6ac9aced7a7528c4 SHA512 8449953697b1ca1bc0d2eeeda984269c816441d0b1817cb4c7f542d5eebdacfecbba29ef0b1ee1d4f00d37a6f784bcc5722b94092c7e1a4bcb03a58124a1446a
+EBUILD kcontacts-5.96.0.ebuild 813 BLAKE2B 3d7080ab0530f6c50d7909177944e8e8fe7806725c05520108657e829b5afd5d3277520f77314c6053fc63957ca3109a2a18050e1f663cc49981ff3daa8550eb SHA512 d092a28527f2e8a6625a157838a3beb10ef9747a08526673f1052954cc5d5473a724a00ef208e9e3784f9f79d67071361ee9fd5876d33ab8e15e4b926405edd6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild
new file mode 100644
index 000000000000..2bf1a6482b53
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+
+src_test() {
+	# bug #566648 (access to /dev/dri/card0 denied)
+	# bug #838502 (again some Qt translations loading related err...)
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 9cc8e21c7eb8..49af45cf58e7 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kcoreaddons-5.92.0.tar.xz 454876 BLAKE2B 6c81cb1940145d21652f61e1808a07ef7bd673f54f955568cb063d9a694c4c314444ae829de6b6a8236ef91147df396e82e9dd1c73725861964b774a31a9ef88 SHA512 b46a7aab486c0ed355e8400ce4d81f7d8d7e9e134305a1251d0d92a7919d2a18bcbc24c0306f34ae3781c7e1c4b73975e009e50bbca74eea22bca44994ff6067
 DIST kcoreaddons-5.95.0.tar.xz 462716 BLAKE2B fd2c03bb3ec0811a5cfe4b5b5a980a953053f9365680c7fc8ceb9207e30ca54fffd148d276f1aefac60c76251e4214d5497a9845afdc895abfc722f960e53b9c SHA512 b9b4337a09a600e808ff66a7a4c5de81149213bef7ae420cd71206577c21009539b45e2bd424314c998671e65eee9e3be0d0b7768cc16dcc39c2cd1162df53e8
+DIST kcoreaddons-5.96.0.tar.xz 465840 BLAKE2B 0801913b454a3de50b08009780c1d254413d83f28ea98d99667109ad26ce60554347f3477f5ffb342ec360f033f4481b8a031e9976a0ee1a8e930f2435ddcc66 SHA512 2f673b3352d89bf11ffbe68e5dae7ca22b0f18661fda113c7b7ca15889b6ca2b9e1f9ebe42fdf60bcd3b6edff257ed7f0efc142d3f11de311defe0861b5a5a1c
 EBUILD kcoreaddons-5.92.0.ebuild 978 BLAKE2B 3379fd5b41b1abc608153fc4550a75aa3971163708b6390581d79f354abc0b431b90a534125db0d42eeaa7eaf307305c1bf251dedbe72af44f20a2f088515a13 SHA512 97a07547a412696694608e7cafd09e4decc2713726ce5191cfb5786711514473917519e0130df8ac9dbddbdb95bf0ef1c76457e7eccc61397beb0c70a8ea542a
 EBUILD kcoreaddons-5.95.0.ebuild 988 BLAKE2B caef202843a2a87894183d84313649230a7595da78f77a988d1ff1ce7084a5378ac2dae684750f26e8cd02ba97683e7d5591784a1f41e59a5bee6ec2244b6cb3 SHA512 475aa36be69a7a94eef43d10acf85e59ca3db71deb7fab897e26ed3c41703e98f864d6b481769c389b8b1e8af58c9305c91e8910f80acc242dcdfdbc938da47e
+EBUILD kcoreaddons-5.96.0.ebuild 1069 BLAKE2B f01389729df1166d56c5215154dcb8d10fcf86241749a51f665a9c271c4fe554d5fdfe028114acb090da7be1225a1bbf31023af105083e7b758f3e164dabeaf4 SHA512 4660c50bcc2ad6ad3c58f405f45454896ae5ff601cbf6b384963db8f1e31dd334078b934115877714abe88aa264f950eaa838f00d1d1491a1b1285aaa2a775b3
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild
new file mode 100644
index 000000000000..548fec91aecf
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus fam nls"
+
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5[icu]
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}
+	nls? ( >=dev-qt/qttranslations-${QTMIN}:5 )
+"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake_use_find_package fam FAM)
+		$(cmake_use_find_package dbus Qt5DBus)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 41c445836e89..6dc214bc98eb 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,7 @@
 DIST kcrash-5.92.0.tar.xz 28376 BLAKE2B 6638906041e0e2d1af791d0c90dacd9fe5b6120d739ae6886b66e09ad51f8d327a85d75823b6269e15e82c82ce0e17a6e0d07db970e0153f35f71e2328313934 SHA512 200ac9999e235f968653141446d3203db9730abc078cbb56922f15869bbfb27a9da3384a1127bd2a79513bec97e10d67d693ce8325b53588e4fb7304abbf6f8d
 DIST kcrash-5.95.0.tar.xz 28368 BLAKE2B fc5714c48c326a7078b064888ebda7c2985fbad6cd5124dde1f0ca76c11c716cfe621ab76eea36dd5e395e9bcd68a7ff5ffbdcd71aa347759c8e664b5126e05d SHA512 704ad643a56101d514c68fadedb34657dfcb82fdf05ec787ac3679655dae7fb012aea564f430da1005fa54fb6edc442e48d4e5dc0ec24e9eb55475be986eca05
+DIST kcrash-5.96.0.tar.xz 28372 BLAKE2B 9b09b9923d37d4242a9cdc178f1f85b23a4dba54f4f1f31b465d3908dde3ad871d786a12a8a9093dae2d8f296d3eb058323b4b372d6600e4c7167c57b2686b65 SHA512 8ad68c4e32fad319b7c9fc17b0daab05bf0e963f97a22b3662c58de4841e602c60f3406289410318992af2bff8ff07130f6b54ad074367f161c03f6106c9de9f
 EBUILD kcrash-5.92.0.ebuild 843 BLAKE2B 3f86cfcf9e5ccad62992d5951cc2e49a2c2e98a0f8b5c906c1599712340080cf7beaed5af114509825084617448e6fe8e0e36711093a1f59adf13c66b6e37405 SHA512 59ca3f5964dd45fb667d80d70fa41a42c2a72da6a99eb303c251c8721ea18c52177e66206d08a4faf6808e3e7d0e617f796294fa9429d62a2de8ec99cdc1fb4c
 EBUILD kcrash-5.95.0.ebuild 853 BLAKE2B 00106c66e5d213da3dffe5cecdf112de90cfaa815fdf87141ccc715b8139b651ffebf32e0082aa95f10c3db81e9b4614cf5a801bc35d74619be4654aee358448 SHA512 62b72988488cdc62a7e718821f93e253a99185b437aef813dacafbf6a863c5b2b922107be635582b03199c66643c00fd18419b4f9f69428e399b1a011ce1d2d0
+EBUILD kcrash-5.96.0.ebuild 853 BLAKE2B 5e1a7ca86bea63d0304d3d3fb9b68ecd83b55de18f08792a0fa86e5542fceb15b6af7e6c0176be2fe3139f6f4b0513e23d518c63c3230562c45c5fe0fd2615a0 SHA512 b5884f85768afeb147b6a3fd49800064ae75e9520ac0d17bb7a3564759e711c6f0f39e2c5e2799874b1644e1868e47db74f958520bf5bbb23e69aa1e415b7800
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcrash/kcrash-5.96.0.ebuild b/kde-frameworks/kcrash/kcrash-5.96.0.ebuild
new file mode 100644
index 000000000000..45caf17eaac7
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.96.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 6495de018188..54b6e2a1e062 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,7 @@
 DIST kdav-5.92.0.tar.xz 63928 BLAKE2B bd08d582c3135db6ccd0f7194bb011d26b4a0e29643d0eb93ea1c126206a4b67974fdf6fdb34062c7309b119ff5e247c41562197701657dc717f2521bdb14aa1 SHA512 4e11c721c0338753810b1a02cc3850e2ce14f2760d7461cbacb7204c32e2f48dd7045d88118e6444ec5ec7a701783bcf2c6c520e822c14849593510a25d374e2
 DIST kdav-5.95.0.tar.xz 65116 BLAKE2B b71cb6ec4ff8b56487188de6cd12efae8e74e62447c65c02843421840eb36c4859191f51b7ed99dd9fe94a1bcb42adc1ecba2e1f9ef04d8d1c654ef0df597672 SHA512 801c10381cf7115a30c66c7e4279b0da922db956c1a24c4e12654da0e99c2d12a3a7aec3a65dd538fd1c878c5a18f814bcccbebe3faaa13243e4e8f8e5afd147
+DIST kdav-5.96.0.tar.xz 65520 BLAKE2B 18e2c19d0a08c008d52c0342ef25ff98998f0e5eddf108b1fcbc072ac4d6d1c025ce349c3719be4594cce05e7a62a96efad40da19faf759d168ed333b00f2e69 SHA512 6ce34a85ccb289d64141bd24f06ba1bdeba66a57dd7c8fd5254975d01ebe7bc9c0890329f86c662cc8878f9c820a1be79d74428e62db17cd26b5ecbc2749fb40
 EBUILD kdav-5.92.0.ebuild 765 BLAKE2B 51702be9f163b4622fbe62dd7b97f69c57a0206f81cbcd149651bc3a77e3590ebbe5bd626ad5a88d0872030b078e0343027197a4425e1f054f3ab1be23dab223 SHA512 e1b8aee39ae09a981a4e80d203ef5ae2b7a72773cbdaea6052fb0f1fd355dc440d148ee355c5d2d563aeb62d5a84d9093038a5ecf167d3eacdb679d77718cfd3
 EBUILD kdav-5.95.0.ebuild 768 BLAKE2B c1def904a3c4ef48dbb6ff479c1d56f16dad35050bd7dbb57505f3808410909f7eeb6e30c270f8f2792fd501007235e1209a20b2f611dd90f7aee659fb9d6460 SHA512 e8a6b46c2e3a555dff658b87a8381d4070c6a0bf30769b58e4a408819d8b95b06dce3b6dc2e910ea5a537f0a5ca08eeccef4dc53a0760bcc58e85ef1a3830526
+EBUILD kdav-5.96.0.ebuild 768 BLAKE2B 91578453d4c1f6203555775dedb714a145e802ba11bc0616c311b0dddcd84ea0362e2c571261d3735433ed97286c32c120d77458d87dc173780ed6c9dfe03b4a SHA512 1b951b78bdb1eeb5cb1bcadeb2b24bbccb45b2c385f3ad0886d973e5f98b9c659277b91ec46f5dd66ac0f5d0ca7c1d2b8ecab4fac362456bd605202b4d369aca
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdav/kdav-5.96.0.ebuild b/kde-frameworks/kdav/kdav-5.96.0.ebuild
new file mode 100644
index 000000000000..a8dd557ee323
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-5.96.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdav:5
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 98214f80ccfc..d9adf8d903bd 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kdbusaddons-5.92.0.tar.xz 47688 BLAKE2B c2be6e5a10a0db32dded038b3a88e6b9ca800b2879c64c66dc721002bc5504af7a36676a7e0af9d7225aeaf82a1ee54ecd1a6dfcfdc56210c0d0f19a679f7105 SHA512 74a5b65ef760b0dff1d3ce86a32685b18e623de5330d2b3b7e089adb158871de6939f82f6f10167f0b2735b1ec0bca5411a24f4b8cfe64ec870cd9927cdc09bd
 DIST kdbusaddons-5.95.0.tar.xz 48016 BLAKE2B 37c48c1ef0dc766d21f3b370abd741fba009dff782e8b604fe7c5bea295657e0f5067e9fcfb22e2759e05cf6fb1fe0c3933063fdd0f070e9e6c865a71c5b6c49 SHA512 0d22a8bcda09e366e994370c9808d83f7b8b598cbd4c4b746f1c7953d5078ab2530a2e8372fc170475a66012c4337d5c2871e4e5e98e615500a907bdaa546aa2
+DIST kdbusaddons-5.96.0.tar.xz 48360 BLAKE2B 274c2d80a407323b1a1164212e901c34b1342114ce746d6edf26881bb257ee81f0b8d7a5d451eb945b1b568396f6d0279bb210eace0e9077da9026a21821c5eb SHA512 24d3e245157b33ea21d637609e8d8bad77ae80c142004590ef9b2071e362271787b9b62dc97ff9f0590ecf9e95c1a973063ac35cbb0cc13168294f1be0d70ca2
 EBUILD kdbusaddons-5.92.0.ebuild 605 BLAKE2B 98be1bf84bc6f2c6b9361a149721cf3973ba45a02a238e3f1926e9b03c9c1bd79bf44a8844516a48e6281e3abbb5e8f2e91e24996afab2efa4833b5cd9ee514e SHA512 4173551ffaa033ed7e0cf8861d24c62ce5b7b5c23970cd61dbf5f10f29d475c5cbf2dfc2dc6d7e209ba9aeca3ddb1159634697e400209ce65bf516f136355139
 EBUILD kdbusaddons-5.95.0.ebuild 615 BLAKE2B 1d6101997bb514b86092998e4b06daeee23a4de594fcd8589d3346c0a20f899f5ff7a6f4efe9261744f8a4f95a82442b7230f748ca413ff52a6486fb3e96f550 SHA512 004cffa54184ced860e8cfa1386bc22901d1a851e40f50eba72f88793d4ec87b267be24ded0eb38aba32f1c834cc2be995f9d74de0861543e73dad635497d28a
+EBUILD kdbusaddons-5.96.0.ebuild 615 BLAKE2B aedc95c164f6c1a8cb88525b0cfefc502faa22e8c6987694a2b721b5605b544ed450e5293364328ecb23294ec83cf44924f655f61d227a1148960f2fa608f809 SHA512 b04ce4d2d3a931835e2a3a6765195a6e9c854fe91e91848cf3d9134c78c13b133536c9d9c7ef4338a2be22cb2b3331856cb952ad09d25df192d22143a2ce14b5
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild
new file mode 100644
index 000000000000..53780e5cf87d
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index a8e9047d7faa..7fe7f8eb736f 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,6 +1,8 @@
 AUX kdeclarative-5.95.0-fix-potd-centered.patch 2116 BLAKE2B 40d26797da63d66d3340de37077a86f8d4ed59b9ecb50ec3eca398a2ca9d20282839ae92746aea3a488df0d3513ce129f34aa8594857ace532653395a6ef65d0 SHA512 f8220241c41c23dc75bed5f26889db72b05526902a41a1d13f8aa25970c93ec6207b5167f63e6596973bb423fe57f89129a5364a98d98dafbf20c2fe45e39d92
 DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
 DIST kdeclarative-5.95.0.tar.xz 205716 BLAKE2B 7cff9307f5098513e65416868845fe3b892da30c97fa01b6e6eca95dc15517d8aa67423fddfb78e2695a7df47b7c9f083534ac993b5b87a0f9b692d725b22d52 SHA512 bedacd087b7215b38ec83291c853238f759532b7fd5941cc02771746002a08233985b624ac31bd926bcd18fb2eca6e703f0a7ae83439a3e63657d6aa3ea647c0
+DIST kdeclarative-5.96.0.tar.xz 206840 BLAKE2B d966d39ff585384c1ae86ee1636a17c88fa6ce6b63668ecd34ce592bb02cd3b248fcc3bb1099bc2f628d48ba39a5acb79f1c3b8ea111621634faa80b6c593e85 SHA512 088359b8f46703c5238ba632325b955d7c5f8e32bb1471f4841f821b07672f1022c144fc619c00029011dce12d0dbd45bf9d2e894861ad679b07c851d85a6096
 EBUILD kdeclarative-5.92.0.ebuild 944 BLAKE2B eedca9ff52fd3d86b73ea12b8251efe7aa1136631a5eb69b118c91cc9ec506310ec9e4e62e0948089c30c4fef95373e50e95d9e87791aa034f88f70e5888ef3f SHA512 3ce5b83d7ad536f0e69d156b8ef61bc09591acbe5bd6b62815d445e2af0ad78c245d6e721638fd314ff16ec48afba355caba0bb59df1d63086dc1435a3ac584b
 EBUILD kdeclarative-5.95.0-r1.ebuild 1010 BLAKE2B 872a1732a463eaef2adeee5ba8236ab4ed5ea04e0d06c063ad5c7dd51eaea1f1e5ce3628d0a8debc6dc818a11a8a73bdf17a8c39cdb15bc56d433121098dc2a4 SHA512 de7d3dd904efda8701496fd423e728ec910ebcb5ef60a4daa4b8dcb8e01533fe8719897353078806564d4c7333c533cb1cf618ed479412bae1dc220293047798
+EBUILD kdeclarative-5.96.0.ebuild 954 BLAKE2B 6ccd2e4319103021ab96e8e8bfdc41e91db931c0bd913544de1b98a73e9ed9b79085f935a2d68b06576cdf4497c53b66f0477f9ac997cce920f3a839b6a11fae SHA512 54a1262163526eee08b1e525959e289c85f76977f26b8270c73f3985ad5feabcf2af171553777a4d38ca528eea80d3e088dadf5f8cb67c3631e55038e8fa0a52
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild
new file mode 100644
index 000000000000..abcded05e967
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index a342877897b7..447513536684 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,7 @@
 DIST kded-5.92.0.tar.xz 39260 BLAKE2B c6a1476e87faa5723a65f3ad9fc34bb817fff4f4b0fed35c46e0c77a4ebdd40d15c4ed978f9ff607d9570bbb3ba5a9c0afafd274eb1e0fd9a5c004d49a240590 SHA512 c5fb2d74a2186e4bd784f3a16df9079e7bdf84272764c62c809b3b316209b30e9de36afdf2a3ac12dcc80163cf37cade3e53dd6ded79ad93c35e3b1a4fdb3ae0
 DIST kded-5.95.0.tar.xz 39340 BLAKE2B 2fec068eccabef4900786a7ddbf6a39f9c0328b71869c686da52af29ed361ab0028ebed332c0919fcdf5aa3828916ae56a7dcafc54ecfa401eb42ac863db8574 SHA512 c57019d2429f0f1662b40f0a0aee0039897c9bdc1f2d7c801e2595a7aadfb686009917ea3c6179e9d0d17c2d745637d39f21deb4640fd3e07a26cd3df9dcd9ee
+DIST kded-5.96.0.tar.xz 39316 BLAKE2B bd7013ce795a2f04bd1bf56fbb30668e7913fc7792dd226fe5f73d11121e89b400338f3681b4963b92c64116faef8e718f372a544a1b2aeb69d8cc6e10137c79 SHA512 125840a238232befe68705d7051baecb83a5a9f046ce9be496351ae9b7f31d2719966fd26c8bb0c82666374fa9d32d0b4a002a2108510c15013dba6b1a096b11
 EBUILD kded-5.92.0.ebuild 842 BLAKE2B 7e465a624fade9c88257aaf7b75ab3c88b97e05de7b278add285f539f3856fb256758337cdd2d8a439f96d44835d3a9267ab85e6d7e1e0bbc43bf8b8d21b2971 SHA512 e81eff012d013865878c8d5fdc65f46470aa1477a7b9c0b300d683d314b16cc42d67fac023f49cecae4b9d03a789a0da5e2f669ba2605b8815e0a27bb9dde787
 EBUILD kded-5.95.0.ebuild 852 BLAKE2B 2d161dcb93a456515a0c36b0cf27fbeda9938ddd1f4c7a425bf9b06230f4694b8ffc8037db9943a627e5c05b3db080bc7599609959c3ba97c276e73c53be2110 SHA512 17e88a58b7c5009b2257bdb8f6e9a1fb98a1813c416394d28378b4eda8c916c19b0a24d36ef36b637c96cdcd0a6356ec3236b61cf9fc935f01c5a3f9fa33682f
+EBUILD kded-5.96.0.ebuild 852 BLAKE2B a61ace0b0b62968c708be2be3731885a7ed927a766e744e486e2647c7a36970f4cb387e6af77b5c5660d41cf7e7ba24c89bc08465c7cea03d3b2c3f7995168f1 SHA512 6d4e32505ad1fccd5ed24c9143a53418b68ae90f03537879c2fbb9b586a7360c46f6d5f17381570638276ba10f3c372d41c7cd3314f31ee9e7ddaa79b1111527
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kded/kded-5.96.0.ebuild b/kde-frameworks/kded/kded-5.96.0.ebuild
new file mode 100644
index 000000000000..5a1c2bb930b5
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.96.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index d3f76846bcd2..c903e4112dc8 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -2,6 +2,8 @@ AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f
 AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a
 DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
 DIST kdelibs4support-5.95.0.tar.xz 3652484 BLAKE2B 1e79b801274ec97352e49aafae391c130e75cfb6f7c66320dc011cbb318b8739234d9bb9e0e3aa33a96e5335ae6fa99dec823552bf6124f231aa48d2a6264bd9 SHA512 28a8a78f61eda609425acc3ef76dc804774d1eba5eabf674cab9abff8fb9ef3925bb71d0a97a13eea4e578f66996660a0bf19851624ab239826dad5de2fedf14
+DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d
 EBUILD kdelibs4support-5.92.0.ebuild 2622 BLAKE2B 14883e4ad5d09257f9f9d38426f0f0d75c6e570566c2c67558fcde5d0e4ff2f2195085018397f7c50caae034436b9ed8381ab7af97e88efc5a1e4c2069a077ac SHA512 f1314eab4343a5526c0e57b3702703ac2d5502ca32d167a470c13eed148cbd88fa5cc6ec07102945c93ac721736cda75809f99430ad4ff0a05b664cd9f49f8ee
 EBUILD kdelibs4support-5.95.0.ebuild 2632 BLAKE2B 6fed2da4f54c124a7224e9dcde9917d451353f1da33c816fc19056bf4ae19b0c0146791f1189f45a14b7b37203d5bf68690517fab218883a62b4c162a25d7478 SHA512 827d033c8c9c0bcf184851ced8b552a109b8973508f71cac56c6bf88ed5f91afdc54cdfa588cce20f8e7ea38006dff58d8b5ad99720ae730b4b9db482027e7cf
+EBUILD kdelibs4support-5.96.0.ebuild 2632 BLAKE2B 71cc462ab59835b22cee8e29c19aace67c33043a0020cd1cb03942821214d91f1833e8ab35d5ffbdbba73ba57a6d6ecede9ac34f443d0b20d0887f6e47e8d9d8 SHA512 71501a87d79db3612d2e6a4e02393a53f47b80191ddaf6a194d41db422d1bd5c90b70a109132298741d1e25f85237a11bfabb6274845020fc6e51b8af3c00013
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild
new file mode 100644
index 000000000000..cf2247023b89
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/openssl:0
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	>=kde-frameworks/kded-${PVCUT}:5
+	=kde-frameworks/kdoctools-${PVCUT}*:5
+	=kde-frameworks/kemoticons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5[X=]
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kunitconversion-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	virtual/libintl
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/countryflags-${PVCUT}:5
+	=kde-frameworks/kinit-${PVCUT}*:5
+	=kde-frameworks/kitemmodels-${PVCUT}*:5
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
+	"${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook; then
+		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+	fi
+
+	cmake_run_in src cmake_comment_add_subdirectory l10n
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index ecd5034121bc..ad69eece7d6f 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,7 @@
 DIST kdesu-5.92.0.tar.xz 55452 BLAKE2B 6c150c1f623fe8132b23abfe2ccf4defb4c9b9bdb538da170585247d3fdca615eeb76d31050f62e28d947a0926fc4731197b25b70a59e87711136de56062cf0f SHA512 6820edaf1233dacc4e71d7cac3e38048fc4fe19df7ef45f51346b07157a57107272fff3386547f0105597b3a7da6076305d955ab0fbcafe5ab9dc4160582deee
 DIST kdesu-5.95.0.tar.xz 55852 BLAKE2B 2d185793075a4847d1886f090814fb1e4985c199fe189690f383c4d5092444719fd17d2062ace29d30bedf4b4b980cc540c6caf939f85b7f5ef74366ff18d9f9 SHA512 d088d274b433b44a3acc0a8a47c4aa15f7d9d0c9e3d3dc6f71c93df052f1a3bc0b04fb18b476d55535c750eb73638f9d6fc7ead88d3bc269139561cdd0b7d8a7
+DIST kdesu-5.96.0.tar.xz 56032 BLAKE2B 976d7fd5def2e358107d834a092e76bda29776b87ec0e2c7a5b990ddc49e399dfbeabc951ec9a71c3da6660a8b8a33c0f899f80add7ab9784a12893f3fbf3d63 SHA512 8ccaebb8e0276fc6e661d15f57271ff05ed83309fc601301796a60f36346a2f105026e43f7c71b2692b0d1d3b7ba0447518e8500ace1c01c9f7c33b0d24e3d8e
 EBUILD kdesu-5.92.0.ebuild 629 BLAKE2B 4a798c0e19ada57c274d31269cf66e419e0c3229c7d01c26c85a54b2620288595f84dc51578e7d833a9ba9a4ee146e29afa6d7686e04a04d26fb6a31040543aa SHA512 6029af52265693f8349efe9be41d139a75e65cdcba7d2b9ec5c0994243bb98236e63988f6ee08f2e5bf51efd07d5742511aa870d0e515244184e4ed6f8fe7980
 EBUILD kdesu-5.95.0.ebuild 632 BLAKE2B a9729008f80e13eeef1cc776d2e6a925eb9f1fb6c021793b735f4e3522e3de71a7a8b118ff9d22009331a5857cf6601c5793c892e31879a2468710ae0e071f63 SHA512 2b508000730610d58e3044f1f3448e61bd36f23c9c5f4081074c57e420583cb5cbca24c1d260beaee39ea2d66e41a2aacdd6f4faec5cdd9f5f16f6775e07b634
+EBUILD kdesu-5.96.0.ebuild 632 BLAKE2B a9729008f80e13eeef1cc776d2e6a925eb9f1fb6c021793b735f4e3522e3de71a7a8b118ff9d22009331a5857cf6601c5793c892e31879a2468710ae0e071f63 SHA512 2b508000730610d58e3044f1f3448e61bd36f23c9c5f4081074c57e420583cb5cbca24c1d260beaee39ea2d66e41a2aacdd6f4faec5cdd9f5f16f6775e07b634
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdesu/kdesu-5.96.0.ebuild b/kde-frameworks/kdesu/kdesu-5.96.0.ebuild
new file mode 100644
index 000000000000..642ef2c2ee3a
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.96.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle super user actions"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kpty-${PVCUT}*:5
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 4887048d6b26..439bc9bf421c 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,7 @@
 DIST kdnssd-5.92.0.tar.xz 61124 BLAKE2B d6972462218e743052642d11c2aafd1ccfac92eff803e03be2f6b85eee6c19ab2269bb66b877d5e6f397f8d26c0079b3f8c309c4a585d95c71dfaa7202e8f298 SHA512 35bf07b7828a77598b6365bb3abc4f235dfe2ccafe936149360f6f3e738bca7a20f48f8f926078ae4f34c556f2da5cd505aa69949b9050550b341c4c511452b4
 DIST kdnssd-5.95.0.tar.xz 61124 BLAKE2B ecb3ae7e3a6e444b7c2b633aa00c0732107d9e5929e9c49edfb185c3217855b74536a0dc8d6d4d9fe21695af26b6f20693708ecc6b51e3a46522f34df38c926c SHA512 c1982106b46ac2e3bd1b2f68ba13c88d72423a129208c2c5b361551728c6b70477dff5bbee5c763517778193a2a1db48c3823512c5a669eeed7740733e1eb870
+DIST kdnssd-5.96.0.tar.xz 61156 BLAKE2B 8741378afd1edb776d4875a591f2f2954d1a44afdd4e38f4066e677c5c21b7ce076d93f86753a9e1d8c0496873e87a1656188746faeb736bd28fe48607463425 SHA512 1f1f43efa19c842e242c1a8eac26b7bd1035abf4dfb1bae0f4be14ee467be28d4fa35432785f088394fd749910851c22fe7908f4fb8a0a881c0c8f4e8147c296
 EBUILD kdnssd-5.92.0.ebuild 683 BLAKE2B 43d46a3300a7b366b322bf16070abd9349055f03f1d8db04da1248c702a7e37234bf3117cac42636f218160ff329e3f8d9d408b1b2b516285132e4f243f7d1cc SHA512 42744ed5479668a1197ba834dee49c37751adde9398cd7330c52e42c93a7568f33b4c0b56920810271a5ce5c30fb317f678a93635f3e2b7a16889e1f62591e0b
 EBUILD kdnssd-5.95.0.ebuild 693 BLAKE2B 944af6d0e64cbb5ccd6fac789261fb99d397ac64266aed09a9acf6493bfff9e0db5d0deb9790f8d5c1b266972b3b13f4c09c108ae9a46f4d0410e942b5210807 SHA512 0c601d3bad0e1510df7b45e19cbb71690b581d25fa593ec2539bded3778513e42ad93e56ee6a584446ee40a77d48c1c29fbaf4d2df11743e4ce10559fbcad84f
+EBUILD kdnssd-5.96.0.ebuild 693 BLAKE2B dbb8e23774563c736b3e3ac11e90a31c89586723151bfa231b092f2d4119a906e18b811c7adab062a1421351a51f60ecdd485990d9b542f2742f4bce0b9d5b52 SHA512 23c10f924afe56fdbf91ad973b925b9ceac65a1de3157dc5db3336f51169e19e18ce53fff4027fe5d3eb44a90e0cc84d7cc61f68c01cbc5435b635257c119ba6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild
new file mode 100644
index 000000000000..c90f55dcb50e
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls zeroconf"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	zeroconf? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package zeroconf Avahi)
+	)
+	use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 74cea2f62f65..f08ed89d94ad 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,8 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.92.0.tar.xz 440352 BLAKE2B 95a4202c31d7880ae7c6ee35877e4b156edbcc89f25ea3bc9f756359d710c296831b19943ec0704c2bc15c8d17b5aa93a01a1751719485bf4a7fe794eea77e4d SHA512 bf87ca5cf7709d634dba631564f45dc5b1bfc6d1ba688ef6534045f5946a9b5cfd3746c5f599b34b25b2b3c174e7a78cf598036e80959b3c7d47e2f08fdbdf99
 DIST kdoctools-5.95.0.tar.xz 440864 BLAKE2B 0adeddc11124dd720aaad52cef887b3a54c2125fee039040f9b39cd9e84695f287836a98a8e73c932caf47b672985a75ed23c6aa867b4a082082e4f61c5681bb SHA512 74dc15087c173be6f0c98482dcc2fce456263845ea5c2293703278630459f59ab4b1a3bcdcddcf2cf37629a149363da66ef2048fd628421c83604eeaec213fa8
+DIST kdoctools-5.96.0.tar.xz 440328 BLAKE2B ed7672eacd056ffc81ed334313f8beaf45dfd1efbd96721ae5b2f6aa7c734dd4bf7b2f304c1ffefa4abd0a88c4e950eed6f736df61808a691d979589b7e0157c SHA512 cf0dea4b872513a1b79db6b4c7b58b56e5c73267cd89668e843ea10ecb3c544614bb22d1af9739436d192805a8f643d9e51374034f529c6be4fb518741f6eaa7
 EBUILD kdoctools-5.92.0.ebuild 876 BLAKE2B 35daa5b95f2564391673dfa8214fee1ed585d7c0875fd5fc4cbb9dbe6a0ba58ade22527c083ab2371046b567bc2be51ad493b8d2dbe469e38880ac85acaeb588 SHA512 7636b1b0fe7c51ac31368719b4a2d037f4719194ed5c88cbebf7b87e77e92ebe563c249ed96f4391e3be9e44b1f5d60e8b8703e65825ffb1351db238cda0318c
 EBUILD kdoctools-5.95.0.ebuild 886 BLAKE2B 6fc868dfd7486d8528201a0c810866c9de77b67783448a19673184db855c933ab4a47a7fffdf5e0d33b291713653fd304e045a53d904178c04e234de3792e8fc SHA512 2ae8ca34ed4bc6a3b6aac1d555bf408b90328328241e6b42b622f8fd3b1998a5ed763eefeafbaef9b6b35c1002ca5895acbab34a648fb4b10c5e85b69ab43966
+EBUILD kdoctools-5.96.0.ebuild 886 BLAKE2B 6fc868dfd7486d8528201a0c810866c9de77b67783448a19673184db855c933ab4a47a7fffdf5e0d33b291713653fd304e045a53d904178c04e234de3792e8fc SHA512 2ae8ca34ed4bc6a3b6aac1d555bf408b90328328241e6b42b622f8fd3b1998a5ed763eefeafbaef9b6b35c1002ca5895acbab34a648fb4b10c5e85b69ab43966
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild
new file mode 100644
index 000000000000..bfe7c47d1dda
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
+"
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	=kde-frameworks/karchive-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package nls KF5I18n)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 32e97a5af167..1213a0271575 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,7 @@
 DIST kemoticons-5.92.0.tar.xz 1700664 BLAKE2B 5ea44283217649b47326e03c7d64e1dcc5d1d409acfd54b64a8550662e88b25b082e97daffb8b4cea11982b35b0bf9dd1fbd762876d5f35ca29877206aa09f1e SHA512 4f04a0df71d16436db7b2c7007c183ba67f29151e9782a395bb674e6ffafe99adf255f32208304052d057c6519d3c35266e85665c7c91c061ae7ab3823fc9037
 DIST kemoticons-5.95.0.tar.xz 1700684 BLAKE2B 5ddde2e5dd164706d5476fd0be9a6b9d165a16407ef971b5546d49f30511fed0027adf93ef43ee1c10eecf3c780b4b1d7aa14eae1fbd88d1b9c4f6256665282c SHA512 e8e17cccc858217caf02141208dbca31b85ebfd463590c5a00612b7e508524491d9c8f5282f4383a6a9b7551f6c77f7c3d97a3d94a718792966e3f9d01fbcfdc
+DIST kemoticons-5.96.0.tar.xz 1700784 BLAKE2B dcdea458fa5ef6fa20142a3b7953a505afc8043a6af1f7e86f0ccd6f9f968149adbfda714729a28120394113737d279db6c31435ff5254be9858f2ac9c5be5d7 SHA512 4db2c2ef25effa8f52729cac58002ef8f201d64ee1a7442432e3738d20e13fb52cb71605c1985a731b41b2990d2d4eafb551b119c1421af0c0acfd958b95b62b
 EBUILD kemoticons-5.92.0.ebuild 670 BLAKE2B d2c21386346a023a9519047266a8f209b768161ba75fc09f657feee721911e95667c5cecf52690dc95be0ba2d427694161ffd8a0df480c05f31fb177030cae44 SHA512 0d0da804ac5cd90508cbf6d814ac15933750a103494f4c9673a2b815603a811e734f2d079ca4f46e53f9d8effe1be82da133ea37d33a7d32b8553db2a0c40afe
 EBUILD kemoticons-5.95.0.ebuild 680 BLAKE2B 2038cc00d59a65806194579b0d95e532cb21daef22d5edc906fdfe56fc1ca7b7986ddf6d7aaabbf6904e2e3151201eb9fde4c408858e2ae1c5a6492bd5762b53 SHA512 d988304c956736119cf05636b37c8b44164357153686daf50ddc6b39f400f3eb1208fb8cc3ffab7f96a0efa1f79d7dab10bb623107dbdc928c04e0c19e9b0deb
+EBUILD kemoticons-5.96.0.ebuild 680 BLAKE2B 38bd46624bd2325474e88b53efe1fd6bb66ea146fe4330cb855720226e583b35530568cfe41110c66d17f7be9f511c8c912def7ac63a523028bc0bda56fab9fc SHA512 1eee71bb6751bc37e37c7f26250d5d74449f97e4cbd3aaa6f45f8c1156900dcc5f708ee4708514e0328a36fa20d89459063bfc2fdc42fa11d0d45f0bb6823f91
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild
new file mode 100644
index 000000000000..81612e35043b
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 6d56091e497a..30a0bdd4cf7f 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,7 @@
 DIST kfilemetadata-5.92.0.tar.xz 430260 BLAKE2B d18d8a537cea3ccddb93a04f09cb63f6bd603a446d0e79c397b1dd34f6cb33661b89a62e9687579eab28567bdf92c0ef3baf252a16a0df350c01d0869895c6e4 SHA512 62eea78ae945344badd780223a929829dde759bcf515191f7cc0ab9c0cffc6510f599cf9b7a73cce3fcbeb0bb6476df9b97fdfc1744f27439d7f743b7879e12e
 DIST kfilemetadata-5.95.0.tar.xz 435840 BLAKE2B 181d37cb2625b73b91f4ec3cd61c6fdb24e0fc02de651e0a6609e513a2862ed72cc8756078619aa4a542af38e9e9f6e1fab8231ac9ecbbbc5f424f12a909282b SHA512 ceedf522546f9dca4de8e772a0ded8a11eeae2771a72690634fd36a3c68288af461fcf1ab901c3d54c2363f9d6b364e8139a71f030634aff3ae17794195f6e0c
+DIST kfilemetadata-5.96.0.tar.xz 437292 BLAKE2B e0c34856128ad8b78cde050d97a594ae0e0a841ae7a02f7946730cbe808de163e55a3ac2e31e1c0cace9b2726d0cb630b3c230a895a9e8620ba28c89f3bc73bb SHA512 c0331f50799b17828fc5f34223be7e2d4f27b9347709115a3f6bda5c56324ead3d70021089a7078c4d4104f7d0d8fc5b04fb22cca7e30bf682d08a0f5bd4fafe
 EBUILD kfilemetadata-5.92.0.ebuild 1657 BLAKE2B d6a4f9185f7baf5dc20c28a8aa69af76d6820ab8adc8f8d6a4e8461a82a06ec4660c512863d10521e08e4d0275240cf42c1c30d1de78651ccc0b7a0d40d0e36c SHA512 147686d03bd2e5d1a0c86499ae8dbaba6e1aeab3476cebffe76071129744d1980702f2414b886972092a55be768f0262f1f0d09fc0a58aa97382b630091fdaed
 EBUILD kfilemetadata-5.95.0.ebuild 1667 BLAKE2B 7942819c9c596461fc99486494130ed2338c0a1eb6196afc83d3913acdd7bdda8b518d67a6045ee134ee1624e3a73131b70e843aaa3288bcc478b426ad2904b3 SHA512 37473761ea4ad36258c121d8af35a53240f31d9f9dfa991d999d69af49862967808b4e6e5e10bb7e3ef31c897ca8db6cf8c41049a832a0f6bf257c3cd894ab63
+EBUILD kfilemetadata-5.96.0.ebuild 1667 BLAKE2B 80e742ebc8c100aef59a677f05608596b8b098ca1ab6b972d516fc6a574dc9f872551c9cb45a84299ce303a9d7d3d809b341343d5c061effcd3fe8dc6133c2ba SHA512 8463010a939fc3bbbaa8368dffeb523d4f883e1923c55d48dff022beec6f721926325440daf445ad4b407e6f435ff3ed34e07c72f91681ccb3b21edc0208d1d2
 MISC metadata.xml 724 BLAKE2B 26662ad6f30efc50657e17c79e056226389f31df126011c446dd5bc8a38449d5eb1ca4cede8ce97d4a5420b65ba0234e9d3428d34273ef9f58eda73960307a2c SHA512 5df051944e48dcd008517ad078ba39593de7ae1188eb9b1bccd429728d87240dc5b9c341b4ce706f5774f414c0c0fdd00a550a95475f427c6e1b28dde4d509ff
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild
new file mode 100644
index 000000000000..8542f300ebaf
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org optfeature python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="epub exif ffmpeg mobi office pdf taglib"
+
+RESTRICT="test"
+
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	mobi? ( kde-apps/kdegraphics-mobipocket:5 )
+	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	local myctestargs=( -E "(usermetadatawritertest)" )
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
+		optfeature "Microsoft Excel file indexing" dev-libs/libxls
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index d20c5d94265d..0a5364cfaa6e 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,8 @@
 AUX kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch 5674 BLAKE2B 9a6f1bf039b1431fd87ec318c3d8fbd1fa618ff9f71f3fb20994ca27619568368391179e93c4604b0d27d06dfbbdd4e5668df9d33a6a45ca2d4e3f8563322a2f SHA512 bce81f0336c8f7f1a0ee7ab550eb0c48486bc8bcdd24af754790ad737be734df130c46f1dbebe642d5c4a60b51ca1f5c793309437507f892a9fb4b73e69ba702
 DIST kglobalaccel-5.92.0.tar.xz 93704 BLAKE2B a7b38b1c7b6bd0a7d20de7dd1893ae42d70888262fff6e196b8c64b5dd16d0c1ec5f8aaa44e1a0cbd39cc675df957e3e86c509ea7418105ef4df1071502d3c41 SHA512 b839dff3fcf191b2bdd99d6ba2e66169e86e73bef06bfaf990a30ad2d4a89d9150c798297f9cd98407a4ff390252b5d15fed8e51fc76a01199498099aa45f9cc
 DIST kglobalaccel-5.95.0.tar.xz 96196 BLAKE2B 7cf871861f243908f58bf0692305cc4a29e18e40a70547175d8a6c725f5c5843fe7bfbea05d308ae75e4e8e0ea2791f8cf77e23ddd72e3eb2e4bbd1bf9c4666a SHA512 defb559a87eb32afdec48f22ad0b28a5b8bfcc8cbdffb9babe9e00e5ebf4a530841261632b37d0e6df04c46c102a1a16e4301d5ef6b2c59d0978e2f6b5857b10
+DIST kglobalaccel-5.96.0.tar.xz 96480 BLAKE2B 21a1033491838d9bd1d4828b9e71eb61b1fbac280864ef44a0fbcf4b1310bcc37bcecdd2a5c30d1062fa0daaa064bb34d70a50f47929fa42201c7d8b2502566b SHA512 8ca729c5b48da2e49a9f923182ec6621180025ab6a82a05a470afe2ed3feb2139fa874844ed85348f748ea8fb9931e2e89667b59a6ea92c4f7faf26de1b5a282
 EBUILD kglobalaccel-5.92.0.ebuild 886 BLAKE2B eab826dd3ab025d67739d127a98a77b2a5e0808ab15c1d6a80bf42505fbb567ac9f4b71d20c8fdf5b9bfa6a4c9980a4ed629752245f5a1f21017b9662c46a61c SHA512 e2a107a207a8223845884cc9166cd65da0b6a667ec8fc6054cc32173d2bedae3651bb90e8a3ad156d3c86c995dcacae3031725d16ae7b6ee78e3340aeddead53
 EBUILD kglobalaccel-5.95.0-r1.ebuild 1095 BLAKE2B 7980b96b98bc3945c3f301b49a5bbfdc97517aefd4f725eca4e86a65acd5a11730af5a2a355e7a426daa3d8888f7725aebe7240883ba365797223fd60f11067c SHA512 1c894300073c44f3da0a724186bd09d867381905c15fbb7e9552d8813764bb21be93a873c5b44255e0e41ca27a6e0b69380584ee38ce7f838e55be9cec23291f
+EBUILD kglobalaccel-5.96.0.ebuild 1028 BLAKE2B fe7662e9209ae753bc57902c0a4b4302ac736b467f8a6012a244b266f44b12cd53e4b6c67c625228160060f965960b963ccdbb84357cfddd124fea2ce603a939 SHA512 207136c7fcfb13c2fb87baab1a254a7d9bfd02cdf17ba359c9779aab4f2167b7d869b49976f37d0d326800dd5b1c21c45bd6fd47a8bbd95756002259a468c8a0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild
new file mode 100644
index 000000000000..d13262bd4efd
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+# requires installed instance
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-qt/qtdeclarative-${QTMIN}:5
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		=kde-frameworks/kdeclarative-${PVCUT}*:5
+	)
+"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+
+src_test() {
+	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
+}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 88d40a1874d7..9a5937d442d8 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kguiaddons-5.92.0.tar.xz 72424 BLAKE2B cbeedd3a0668edca5cbf712dcfa1264a6449b80ade73555fde11b4410f0c9ce403ca6a884429cab8e87ac4b933b2f03fb24a7f5138c23cb1d6cdedb98e076af6 SHA512 8a5e7db33938a43151b3c1e2bdd3f4b273abfc8f35ab24bc9f8ef99e541ffd92350e4f6d4be5c5123e98b1db73ef00b687c7bac9ed950dfeb041c0ecab074acf
 DIST kguiaddons-5.95.0.tar.xz 73412 BLAKE2B 36a380218471d4441ef48489d0b77a21f64df8720f23fca37addffa5f6e682a603747a51801f73f4d94c012cfa76b17b470e66c92456179a08c84247ca212c98 SHA512 e542611c1d5b329be9f4b4e436bb5c7d6c5a79042375a05816e07f03f658e0ed8b026048293c6b6251cd6cf48e1ed82ba280457b88e491efb0fe975c47cceb5f
+DIST kguiaddons-5.96.0.tar.xz 73428 BLAKE2B 10f51b731c95b23e2ccd51bc666401ec48f1090373154eb2faf8fd3db21b20c760cb1fd1992381787e0954eb9d777beb2c9e3be113b751404a3000cf6418cba0 SHA512 fccc8175de2e48405692ac4b34a703d9a0d0340b0b682f13ca26af8f44161e3e7f08821672271680f80cfdfd0d5d6c369e41548720d4a8b921f417945e698bf1
 EBUILD kguiaddons-5.92.0.ebuild 854 BLAKE2B bfcdffd2f12257541aacd5fd88de7515a91dd0c90b151f982d6b623cd90fa3722651c0e8279b6665df9f635e3c4803d28da43009bd9196cfc743090c9b4075c6 SHA512 cc1cffc2105c6c4c46a1f5e6a7506ab1d7ffb1e0ad4ac83545b825f85d56de4a792fd0e8480fd0f856c4bdf7fb4cb3e54ba9261fa414251dde0d68ecf19384c7
 EBUILD kguiaddons-5.95.0.ebuild 920 BLAKE2B 69e27dec1420ee30fb62a64cc9ea591ceb97fbeebc4aefe17901b23a81e18d1b0fc18118c0dc1fd7df3148368bc2631559cfe36b3ce1d87ed6f302202fa159c0 SHA512 5594e85bfbd443bba54067be9a5a4c3eb16426cbcf2f3b082655da36c00bf53a1beae759d4ec968a2cd0751533544a2ba994fa60bb20cc06b24e9a566b391ff9
+EBUILD kguiaddons-5.96.0.ebuild 920 BLAKE2B 07e2dc5cc786e1fd9074a4c70edca42b0b3d26eba659a5c692ce4322ab3f2f358df93ae06989424e389f787c3ef50a548b86b182981cda97264b52b24161be88 SHA512 1b8400876057a029956a7d690e78938c8bb08edc33f530fe9cba9ad9f8db64c6cb2b8ec5c56a108036012c0595cd01d9cad151d5557c6b40d55dc685c965ec8b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild
new file mode 100644
index 000000000000..609c30697959
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
+	X? ( x11-libs/libxcb )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index e649346e8554..709f8f29b8b9 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,7 @@
 DIST kholidays-5.92.0.tar.xz 235388 BLAKE2B 3ce0840c458522a8d4d407d620ef7f69fea8f0da5f42d33ec896147e436355aeeabc028b823a2e23a339ac31eeece61e381ca8eaa59e9fff5fb2801344766ff3 SHA512 1ec4c5bc513685e7f8834621ce464a003876b4c26ee4ff84db5f13e1cb253fb7e1c04fc7ed1b9ad92dc7990498e8d5d10fe4b3799f33762eabe155296093a3f7
 DIST kholidays-5.95.0.tar.xz 239132 BLAKE2B ded0f9ba4c1d7b86b5f1bebc9519c691a71922c4fd0d146ab4237a0099921fadc56d8e339861f2ea2dccf9f2062c4c0bc35d42a077b69f3a39a3eeba7805ee29 SHA512 a1c4d08e7c4af94b45fa89865dba11aa4ef8c2be610eef93d1f97951670771c77ea88e236b7c891d3a7b7c5531b73277bce24ccf0c5900f5a18962fc9f2cc653
+DIST kholidays-5.96.0.tar.xz 239304 BLAKE2B ab93636e48f661a5925cbb5e1827a61066c64aa329ff6c64ed974ebce2ca8329a4a222f04db2327c2942f29676ccbbcc390e758ea810828d5c2f7fe69d7f5ab3 SHA512 e6a8a249c60a95a35e859569e3e67603918f4a93e6844e3e8e9e9e81b7420092a44057cb4f668082319fe90b41f35cec87f4ac147b3f55f48a99e8670135d496
 EBUILD kholidays-5.92.0.ebuild 656 BLAKE2B 4f29338c5b9ab7d8df9078dd52d997c01f99286a7615f97b63ba8ec312fbad406245db32d8f0f65b87b787cfbacb83dc374fabf31331b06c50a81f71565c57a1 SHA512 a1a8778a75050d53c6ed2476771c4c2504c81b8efc9c9e0359d6d8799b802ad41fa5845ee1ff2179cc7a8819d04a02e8f94e06e2c1bb66fe0c5a5172f47c92fd
 EBUILD kholidays-5.95.0.ebuild 666 BLAKE2B 10797a7f61207fc64f43711e11eae1cab6654f1d432c4b5c8bde91578161988430a879b377431d9ed4088828505623b91d2bacd2dfb0f3b691d407f4e4aff6a6 SHA512 ad77eaa3efdbc06aaacb7757b534ef0099ccb6b33363ae12f728acefbe724ad2c8fda63c82e2697e6aeae0e6c3554bc44f4bc87e303ec4b43eec4c91d24e8d3f
+EBUILD kholidays-5.96.0.ebuild 666 BLAKE2B f7176467120ba7cf543eb013531e412db6ec02a6233c98d99255af2c1d858948ffc5b70c81419b2f49e7ea465be3c42aa36c8b5498d7f626e33a1bd8d788ad70 SHA512 a49918cda0be902e22b72579083f7617a4311b2d150a36ec0de657b3c960c4dfa9772c7c119f2c71e301253930933aedd0cb6c20f728bdc3ccd842a7010cace2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kholidays/kholidays-5.96.0.ebuild b/kde-frameworks/kholidays/kholidays-5.96.0.ebuild
new file mode 100644
index 000000000000..3121f92cb3e7
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.96.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	ecm_src_test
+}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 3ebc98bcaf9e..8fb610ebdc48 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,7 @@
 DIST khtml-5.92.0.tar.xz 2093568 BLAKE2B 1c94b1ee041fe69d173798ade211feada3c9f123fd9a6f6775cf3453ab677f8001053f7785dd492acb81c6908286bebb592eded670771c2dab42a8a9aa58c300 SHA512 270d3ba357ed5c031b41564a56e0d91df87702cd05ea810434a8e2cafd87fbdc0be8984ed535745edf592c318107464f0aaada0c2ef42fbde7a6f87228edfcef
 DIST khtml-5.95.0.tar.xz 1965944 BLAKE2B cdc3e4cf44ab3bd8dc7de581c6b73c9bb7d5711eaed4ff5804eaeb236e17eaf59ae4a3e5fd1e3816ba101817f049ecdf9117f9db032c1f26baf20042c535e314 SHA512 749a9caee2d848100715f643c18e34e13bd544be71e7816bf769876232f1693c424cce0743ecbdc0218551207c9616df648d8ba9bb3524a56fa757928b0bb3a9
+DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
 EBUILD khtml-5.92.0.ebuild 1760 BLAKE2B 47b708acdf2d2ff1741766b9722ca919e07d7ef599249338a3746d2f7e540a63dd986b5b2659373e17b9cc7fd92fa2ad96f73b7797e60f5cad048642be1a8b08 SHA512 4cb28a80ebe665343d3d3eec94b22fecc90bcc8242b74e12b871ba91c1d4bc2fef8924fc900fa53d8137825ba275e55cf5a2d59f20ff8ff8252ce1e0d4059244
 EBUILD khtml-5.95.0.ebuild 1782 BLAKE2B 8b5bb1ef101aa415fa60a8f708bb7938e59ff0ffe1a5d7e1baacf063b4bece42ece077711b0edcc87b90bdf7bb85cdf951a36bca3784b2c97c4467858c1ae09c SHA512 747413c5170f84d28b99be594e1d74060cabb1dc807923942aa0ea5bc9d99bddcaaba6d7397c0724bbce8902035cae4c367734996f4344644b3e100a33862616
+EBUILD khtml-5.96.0.ebuild 1782 BLAKE2B d48e2a91473c3e8f5a3da9f15af21d72d579fab0d97e58cafe9e19cc7abde998c87853bfbf0216d04c2f485283dbd5ec4881f4a93c74e0848da37b60695593a3 SHA512 b91e21ee095876f995dd079adac954259469d184e7640dddfb1ea3ff59247db7c694c339a7063a48979d626c7f32f8f79ac9834c874320f674916f70e860f260
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.96.0.ebuild b/kde-frameworks/khtml/khtml-5.96.0.ebuild
new file mode 100644
index 000000000000..f3e326ab8c35
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.96.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/openssl:0
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kjs-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwallet-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	media-libs/giflib:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 6ea9f32fff2e..8a2809495078 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,8 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.92.0.tar.xz 956048 BLAKE2B 451f091aa44c6845a7aae509c8e13ca3c707ad1858330ad97edbe94ded6646a02dcaa6d2d852686633f62539c332dab6189502ebedfd40b8374144c43930c946 SHA512 0eba368abe4ff385594e22e808d30b5d4a9af95e8bb2a3f4379518b374aab8ddabef18ebdfc2afd121ebb5f8865a427a49c8abf9c59b126cecf78a48640439e7
 DIST ki18n-5.95.0.tar.xz 956820 BLAKE2B 6e9da54dfe18a14f6193cbd01d76bf0b0080a2afd83b55d3f15676a3e57ccddb2489ac299e4c7fcda0605de827a56ec9879935ad0159fa328ee7b02cd67cf08d SHA512 13cb83fb3d4171f3f51eefb65cad0b73380b2aa7936b0d7aea227a74f95c9e759efe3097ceadbe6f7a08ff8a9ae3bf8708ae3a57c4ef095f82b9e96740f37881
+DIST ki18n-5.96.0.tar.xz 956764 BLAKE2B 91f00093b8f28f64ffa3221c0717e8f203d5bf6c4f2d9ff1b267a4bfcfe136be251ab46ad987bb68b51c3ba85cc042ba247ec0c196375c99fdec3fbe6f4cdfbe SHA512 ab059bd98ce16e20a803f7597ae0e5e3698f6b5ccbcd846131a8c8b0d02201ca9a61ed67ecf93cb2931ac347d3e13d5515079643c2cbbec39b0fe8139de17216
 EBUILD ki18n-5.92.0.ebuild 959 BLAKE2B 13c63da713b4a80dbda85181ed6612f1c85336f947e3ebb24a510ccf201318e5e62e49101815146c4f08a638293dba80458dcc6c55fe66d3ffc83244c8ea8208 SHA512 bba70fe0983397432e548ad023ce75299527abe0d26d38440a1ac437e290a93ba50149f4a7e4fc7a95cffcbff3658b2308276b634eb1235861d05624a9891694
 EBUILD ki18n-5.95.0.ebuild 969 BLAKE2B d4e43345bf8a30384fd3c4f520509b8ae1c4ffcb4a92386f8c629c273e0b3d083f483b05bc238e717c0cd3f7b402f43a05d33d7016a011ea2e3b1f430c1f82d9 SHA512 81f2064fde850812e9adc5eb4558cbb9758ff3c5ab0b8b424ae9745fedc6b77167519e234f7bf922adb8b8ad907e946cabafd6be941cc867b935ece9b1ec46c8
+EBUILD ki18n-5.96.0.ebuild 969 BLAKE2B 9b9370e12f1fdfc82e1dc03dd0415ef11d3ae522f06dcf1af1ee34d2edb1b6ddaff6bf75694f33022d73c3806d17a1a0bc8218be1de9b685b6ec313d2ed229d9 SHA512 0e71099d3c81686566ea6a3874e2958b2e3df6023b3cda63a90dc4b8e416b338af3250f4f143e3ac2a4b9625500d58705c1d8cd8ce0dca9fd5e5d60c2f00deae
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/ki18n/ki18n-5.96.0.ebuild b/kde-frameworks/ki18n/ki18n-5.96.0.ebuild
new file mode 100644
index 000000000000..0656c593cc9d
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.96.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+QTMIN=5.15.4
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires LANG fr_CH. bug 823816
+	local myctestargs=( -E "(kcountrytest|kcountrysubdivisiontest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 6bb0cab655bb..a91b5ada8e01 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,7 @@
 DIST kiconthemes-5.92.0.tar.xz 226260 BLAKE2B d05388c112934827d5257ea03f20d6936194ea9b8a9d3390a6d34d001efb254e9bcd3a8a8dc3d91edec683f060d73d27c1a8ab21e966994bb939bb4e81d1266f SHA512 b05d414690c0d1c304145c57f8a594879580423efb121cd6597eae5afbcb28e1cfc87bf9e44ef8f9722554e6b8135d299ba90c49a4d50e2ecbe64440806bb199
 DIST kiconthemes-5.95.0.tar.xz 226748 BLAKE2B c54cd4f28f59dab81395e53cce2a2f3089d35087bc21fc12fbcaf20f4542153a3074678409e2474a094a30d1f39d404aff9e3b27d07da0e1ffc9709a4555d8a1 SHA512 e1814d57d8c8003b35b91b68aadaa8bbdf794543148201bb8a9b87e88a94df3acef587b69300d164a778c47951181d313f1068f36cfbd0ebaae1b16d6a4a54c7
+DIST kiconthemes-5.96.0.tar.xz 226752 BLAKE2B 58063e262e98a5bdc9e53ec450231463b1ac68b4ac907661494a45d01e7b9efb71effb8ca44a4eea8077ac6aeeb4b353e9e0b32ae72430cd849742f65a53b55a SHA512 2e392faa6859cd96395318852b96423fa3e132904af77070edaeeec30919c7ff0007787e0a8f3930f7226fd6ea02d129779b2607facf47c66927b8794ef81723
 EBUILD kiconthemes-5.92.0.ebuild 804 BLAKE2B 4c88a8726459b935943c733977825f2b6e332115ed7245bffb2e3ded7b52f82457a435638715e484f8c24d79f225a80cb02ec653c02a2a11554e2ad85a224f87 SHA512 553dc2e8fddad18c42296ca1a1974f00e61de5b4797313e5fb6af8a1ded0c0f02230cd1f705a98d93e1175ab65c55c27b800d5134abba89aded73dd49af4d9ac
 EBUILD kiconthemes-5.95.0.ebuild 814 BLAKE2B ac77b6bc9b7a2355ae080af0d3f927f3b1edf78a7804cc173da73add2be74e07b846fb31b31d69ecaf69c8a2c263470f2a86203d7b241554537acefe0e1aede4 SHA512 c98ecf88a9dae1fed72806096fe6b79c1c73dede7d55c14f43e1a089876911162c8ea1662f17817a60ef7b0f8838e22f5a9d28d7251b8538edbb3fe3cbca6662
+EBUILD kiconthemes-5.96.0.ebuild 814 BLAKE2B 4ce2a4f612f87f35d50f08221ced9d235df30318735246ff18a626c217a23e059c3dad134a3858e9ab6550cf20abc614d63f70403af21293c5096a92e96be7f2 SHA512 0993b181acb617259a95eadf5faae9c562a256c1f9d026f42e4727cd887d204a06197e6770f95bb94c4f78b0860500ea9f519c11403af574355156a3cda8cf34
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild
new file mode 100644
index 000000000000..b649b03115e2
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 574770
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index f17c1ec89866..f0edc16cedac 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,6 +1,8 @@
 AUX kidletime-5.92.0-crashfix.patch 1315 BLAKE2B 1b931ea07a39978b3921356134af97fa864970e055bb32bc29257763d355b00de2062ae96e5e98512f3d068cd2e5d022096aae8afc77ab64f90cf8267c01c9e2 SHA512 7d46e337eeeb44a32cfae0a7b83cbfd5d31b79b6b3e6b1f0b99209ca5c082e81eace354875a9662c5eea674e98a2a47f5156d7f83f1649bafadd8173968b6e0f
 DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec
 DIST kidletime-5.95.0.tar.xz 29088 BLAKE2B 9aa7289b1e39fbb3a2d4480c02e107148cd293f85e51556bdfa9d03aba8a31501da4a6ee2e516b8b82bd34ee559fd5d669fd6219a159f43baf34f1fc079c85ed SHA512 f7445c1d929b5e993731f64ad735aac22272b6cf4ffb6486879000392d8d00024d1c6c83937d1898a43d7f09bb4f547bf7e0332d2b3ea939e8978bdd9260778d
+DIST kidletime-5.96.0.tar.xz 29108 BLAKE2B c8bda958d716da078101c075647306a31cdd6404aacf7a18cdceef47adbcaebc7831d85e2aab94816f7a4acd087bccd8888bb17ef73d82ab7a9a6e4e19701ac4 SHA512 e7f991195ed48264ef11cee07843f7bfb2b93e701bda8fc2dd450d00055b24246b349a4a76f75bb13d81dea03e8170083b28140fb4504769927f5cf68436b335
 EBUILD kidletime-5.92.0-r1.ebuild 926 BLAKE2B 24acd13051911ef419083221c5c8b3832f02a21acd32d630e2f0df6ff9893e2324206dac3bb4a00eea74fe8836b4f9434e84fdbac8510954ac98b3ee31b18304 SHA512 920d8210a3d22f339df54b8cbb9c0c912e5cd5957b318f206e4b726b77d255cbd401974b8f943409977a337b3ed5dcce92ef1f0f5a8ce6829d2194eacccb6f73
 EBUILD kidletime-5.95.0.ebuild 872 BLAKE2B a152a525389a34d202f8537e9bc0193072c2a2eea0d2f6cea1eef43125bcf3bdb9cbc1a6bb5f421d35b3d6d19867a760caa7d388bc71b82b436a9e4c3476e7df SHA512 18a96f6502139195a23cb5f0232dbaa1ac1fabd36c55a9b6b1dba34e07f96618a1074fe187e621e0370a79463862080843033dab254b0ab20f9428d6aa6d652d
+EBUILD kidletime-5.96.0.ebuild 872 BLAKE2B e7ae25b338ead4ca028612b542e4917bbb993569e6b5f994c704d8787fd36a9ae4efb436ca37c2b7b49a3900890a795e4f153b236b94b53cb94b39acfc439702 SHA512 5a66f12f44785a356d2bf206d3408787d65d3fd44e439965c5dafdf87b08d6c4011c04aea2f2e5c6cdea344592fd6c07104eb907222e52df1d25377c6664a589
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kidletime/kidletime-5.96.0.ebuild b/kde-frameworks/kidletime/kidletime-5.96.0.ebuild
new file mode 100644
index 000000000000..8784d6389d66
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.96.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		x11-libs/libXScrnSaver
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 63eb14c9f86f..e7d63db487a5 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,7 @@
 DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
 DIST kimageformats-5.95.0.tar.xz 2926576 BLAKE2B 4da4a8ce9348291445dc18ee01fe42d313aec1dab76b2126d749cfcda72e7b8710452d412f2faf45aa3fc9434d22f838fd442d4ae07c9115157d704252cad8fc SHA512 a1f119cf18998aa08c22de7880bc16a32539ccdb17f4a95b6363fa1c57c899982a0c399362e8ead5d33015b6e05604408eee73d1517d72d314563de3db23d76c
+DIST kimageformats-5.96.0.tar.xz 3589112 BLAKE2B 2a9e5f72b09e27ebb561013f816b41e9ef8be9d874074ddd014f631a57f0da79cc2785d3d528f9ea9f76b940075f0f7649aca57c8ff20a376f5ffa3adea80eb1 SHA512 37e51279824df05391647d45125676127d5570d4ed0905d2378dd627c3542d61f6f43bdd4e6f28ef43268127d120c1d2829a5cba34dde1ba7427b9051d241c1c
 EBUILD kimageformats-5.92.0-r2.ebuild 997 BLAKE2B 7a8100737ec39152b982747c0fd8af52a7e0661abee11ab7d206b6d4aa36bc178c6e70187844f6542a3f03ee48f868688e3dcf74b0d8cdf32688e8b83a98cbf6 SHA512 c62a13db352f70ce60a069bfe3e1e0df1fd4918d27a989ae6ff50000505dfe21ff19dc364f6c37f73a711b04e27c6f220e9acf8f4fb334d9c4f93b652069541c
 EBUILD kimageformats-5.95.0.ebuild 1000 BLAKE2B 314086a3829a66beab07804a259f54e23e0586b2d867b1bdcecb97db6be81c1dabca647b75d74f3f6e1e85dddbc739619c0d559cc1acaa94bf9899bad837e29a SHA512 df574afa7761a0a4b6a34ebad38995bc654107106e1a62fe12b0c96f80b1d928f03f357255a314dad4ff40715353137f329633cf7338b61741224fff67d2d69c
+EBUILD kimageformats-5.96.0.ebuild 1000 BLAKE2B 69e72ce73a3d7d6f9ee678fd2e18bd1b5782644bb4075835d50080e94fde2c975a0c8abbda9ea3cb24c4c2b1d8c04d3f4199c20f276c093bf6257090ce4e07f4 SHA512 2c03d861eeec8a2ac48c0eefc33d2ce57659d886cbd7ad7156ff8ac4d1795c6eaa19691a980743ca4ecc640a33f1547416a2457e6d10d34f7276cefc9f4ebe30
 MISC metadata.xml 714 BLAKE2B 2b4fd4b370285820e2c7966aa910cf57ec94ae4c7daa7f44d9421554d57149d696e751db8020b128321494027d1e4142b42b1b9ce1538d3c8cf93a6e72c93892 SHA512 0a44aa8d3dd4cc2fe1d73938792daec37af80c72d70da0a3ec8a1d6f610a54f5fea85008dcb9187b0a77671467eef52547e8bdb61bcfcfb4742df61f9da921d3
diff --git a/kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild
new file mode 100644
index 000000000000..83a88017d10b
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="avif eps heif jpegxl openexr"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+	heif? ( >=media-libs/libheif-1.10.0:= )
+	jpegxl? ( media-libs/libjxl )
+	openexr? ( >=media-libs/openexr-3:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIMAGEFORMATS_JXL=$(usex jpegxl)
+		$(cmake_use_find_package avif libavif)
+		$(cmake_use_find_package eps Qt5PrintSupport)
+		-DKIMAGEFORMATS_HEIF=$(usex heif)
+		$(cmake_use_find_package openexr OpenEXR)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 9e46580b4c31..697ebb6e72d6 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,7 @@
 DIST kinit-5.92.0.tar.xz 119244 BLAKE2B 0ed7937e1ce6b8a21e632708f5e3e02b3b1b6bf481d488902fe8033ed9d84c1a54a64243e59d77e4bd9ec4fffad6a549ca5b15aec71b1d70d3005f50984c7bb1 SHA512 3ab7e47e714c661bd375d36c5f64ec4fc2e445caa20d783e3affec314228096bde75ef8b9577590c72bfcbb2f6748525ad0593c2f4c3c1f0646173d58e225b37
 DIST kinit-5.95.0.tar.xz 119288 BLAKE2B 7b0119a6ec59a8a6c51ee37a4169191164138899b02faf776fbfd98e94e5a981f7b2f89832fcfb3a8aed3d15b072775d45db3391e1e9922fd2d22db13578b31d SHA512 90296988ccc7e6d5c20eaeb60eea541068e50bc92caabdf0fdc3ca9bb947c20563e4b78a3897ad4da94d37cb6becf7606c332037fa99674f7896e7e4dcb4972f
+DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d
 EBUILD kinit-5.92.0.ebuild 1141 BLAKE2B 7c60d4ebfd7848aae4df049d1ad05182f60a8b67a438ac815b04b1b39285b2a4cb08f5b6fa2d5a12c6fb00fa98fc9878b16cb56afaf0d0094dbfda58a792a79a SHA512 1727efdabdbb6b05316adc5dfcfca903be142ba45d1b4780826c611c95cd477742b3518ef2176bb1d4391cf317df19a30cdf657244d20544274aa81b36351d4a
 EBUILD kinit-5.95.0.ebuild 1151 BLAKE2B 3b82a0ddbac159e33f484323b8da047302f8dfba45408e7b2c1d38696f0dc3a271edc0a6682e0afecd674391a10bdd1448b1e1698aab1464bd50db754cc4f8ce SHA512 0bf5232e0f0c79e5029a5d76656cda4085f01e821c912bb90402953e1afba5eb561f3bfcb3abdf065d866dedf74884b37b6be11c80bd8c2b6b28a84956b9afda
+EBUILD kinit-5.96.0.ebuild 1151 BLAKE2B 0a9b669ddb290e95e47f9abbcd0f5006a5c60163d76a148fd3203dbefad1ae2bb95b8e46603d4d9cf4bd8ac94043295e950201710c6e56464795293145192906 SHA512 350a288e8b294ac726a288a5788db8dd205ceaaa095c0bf95b21bb60c83cf08be4fb174082478a53b706fea0d5ac9f710f44f1070f7d33d29fd49a5d805ac15c
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/kinit-5.96.0.ebuild b/kde-frameworks/kinit/kinit-5.96.0.ebuild
new file mode 100644
index 000000000000..b5ca97633e81
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.96.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+caps +man X"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 928e1a5ebd4d..327e7b89c893 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -2,6 +2,8 @@ AUX kio-5.95.0-filewidgets-update-filename-after-rename.patch 2784 BLAKE2B 9efa9
 AUX kio-5.95.0-fix-recent-files-in-gtk-apps.patch 846 BLAKE2B 7b8284df73fff1236d4dfc9f23b6593f9b45bce9c2d7cb78c556f5074d2a562995ab86fe8b9dbac46083f14826b14f7d1a2423c539695cf2b66249f7b3a6e095 SHA512 c28d36af0184e4ca0f140f460d274ec133e98ca90571d178182c3a0d8f30b9bd77d7177eed7f569583b366dee63185a13ac6ef367da6a4675bbe768afb1aeb8a
 DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
 DIST kio-5.95.0.tar.xz 3335684 BLAKE2B 5f5aa12c15a3801a5a6faa741b9cf8431d319852470a6ab730a633455eb81fab6678d236f0567e1e8a6411f090148776b6280dfbb228f907a74e7df7da6ab3c4 SHA512 33006041ba6ef74af7f3d2fdaf35aef3059d4439676bc0bfb44053e2deeff7e3cd85a88428406096b8498918d5b793cdd30f74c8d2ddf1af7ac306fe4ddd74b8
+DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
 EBUILD kio-5.92.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd
 EBUILD kio-5.95.0-r1.ebuild 2553 BLAKE2B 359f748745424d3c9468e8d4e2f024bfa5d8b20d83208111e5f14e30d4d9f7be7d11e8781d4531631aa14e142d627a497f8df25c7800f86d359be55d54f9ec22 SHA512 0089a64fe443cf6419b14174c3edea92a1dd1683a88799d1de1a450cf8b8da9e319d644c90cbc995ef7b886055f197d4e30e73256dc7eba59689b073befccb05
+EBUILD kio-5.96.0.ebuild 2418 BLAKE2B c486d3fbf2c4c4cf3a9171df449b1399a9a2c1f9e3a42723aaee22e186ee0057ca4586f4704b42d3b1495b85767ad539084066d85d411816d0c26eee4b7a36dd SHA512 c6e0eff0ffaea4c6eae49f5d5cafd46cb21e35791a9a9b9e5b30689e028690ce3ca66f8d357c9a0307022a8b2313cf0838d8fe09610839cc08da2c3417e6294f
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.96.0.ebuild b/kde-frameworks/kio/kio-5.96.0.ebuild
new file mode 100644
index 000000000000..a2d01a182282
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 13645a8dc035..9d7fa31fa424 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,6 +1,8 @@
 AUX kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch 1029 BLAKE2B 4e625a0336aa9ff3734cddaa6ffc4708a4555a365f1a69e79c10cb13300d07707faa63d7efb24cd6c2b747005f4bd7ac7f7ac907d9ecd81876c152a41826a5c2 SHA512 e6f1d125b54a9f5d1af758172cfd06e4801225a5ef1c38a3daad5f6ac8cb41d23fd96fa636c646df8428a268988626236e424d9f8a9a7f70a5ffd7ea536fc5cf
 DIST kirigami2-5.92.0.tar.xz 354848 BLAKE2B 7aab1579693f7cf57a61f45eb3d7bc7431bee01ed1ede918e0068d3b4d41abe2f5b5f97cae9538068ae6ebe27a5abce3797c7ade7ff225a40ac49cf46c61a742 SHA512 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a
 DIST kirigami2-5.95.0.tar.xz 357640 BLAKE2B 083f6f1c9a005c939b707ec851402f26e9f32db9784e8554d22d884da80bcfd3e621decdfd1f7a732c0ddfc0e8a66c76934540a6e0a14d6f05ba1a1b7229ab1c SHA512 99bfbadfc805e7e41d7814992b6ddeb8c67a9d41ff7ed764baad30c028a9587c50e2c6bf368cae5db9f11306b4a245ec6510ea6690eb20ea3e51390c00e31788
+DIST kirigami2-5.96.0.tar.xz 359936 BLAKE2B cadba252c1065d7c1c7a539b9d28489dc61683a3b688bdeb4c7d43528494d62d9f4fa3515d29a554d0c47c0bcc81169ab8d3f83952911147ef4fb06658560e50 SHA512 c96e7d53d263f3c5f0c3f3f98c6523555fd67fa5e12dbb0aecb81bc9f8a46f641d2176d377e9c7d901ca235151e004ff1163ac07521aabfb53e0e6517b4df546
 EBUILD kirigami-5.92.0-r1.ebuild 1071 BLAKE2B c7f454c207320b6eab18a81ef5ea08127e27660ecf8961335796919eccbc2761f3b2a6d1a3f5479f3f3a09b41e3393d19062851fa63ea580a96fa6ee2da5cfa5 SHA512 5da52aef003d143b266668241acc5c573c710168e92db8699c4aefecbe00fd0838d6059d7109dc55124ecc08e0582766508bd0c034e085868b1bfbcd5829bf88
 EBUILD kirigami-5.95.0.ebuild 990 BLAKE2B 44fbcf6ab0f1282c1971cd93e87671d852b020c21bab0abf20b4e43684ec9dc3c595eb22f6c77b28c828ad5984140a8aa781f175966ed5cea7c2c5e69e4729a5 SHA512 feb7b4c46c8e299393194d1eb2fc1da4849d97991f940ada48cdf16c74abd47f422aadda58b368abc753a872f9c3e22374a68f6482d7e6ba30cdaa49e43ca55e
+EBUILD kirigami-5.96.0.ebuild 990 BLAKE2B 3c6471e5d1d46e31a9a564068b28316b419a8737a3cc1e02ae428179aea0d89e50c1ede31d6037d1c4155875e9af5f58933db7ad4ca4064f8b72899018706a51 SHA512 f2f3ef806134efa58ae8f4725ebcb43c8cdacafb8d4b27c50c07a3234eb286670300d270dd46c570e109634291a3c7e323d6f89d13d33d740ae70698d0bc340c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/kirigami-5.96.0.ebuild b/kde-frameworks/kirigami/kirigami-5.96.0.ebuild
new file mode 100644
index 000000000000..401aa9e7467b
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.96.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT="test"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index b4dbbe16e6d9..82c98cfc112f 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,7 @@
 DIST kitemmodels-5.92.0.tar.xz 407008 BLAKE2B 5a5da7ad73b7eb63b64b1fa04032e85c300b936757d11fc2573d025db85007ec46083a98037f3eff193f4078c763ef53aec585cdd7f7018c71bee8e8f415b47b SHA512 cede4a959abc66aeb58902630f66c48fda7ffcffa6bd43682cb17699b58bc2a955a7b86d9e40cc627470fc52db33906c6ae74973fec440fcea5e862715afcda7
 DIST kitemmodels-5.95.0.tar.xz 407252 BLAKE2B 06c8774db4f11072455ce967c65a6fe0b6c1375db84dc7ec76c733eee83d4c848f2758bbb817aa49434c4214cd50c010cc462e0273c4db540d4bd2d4fdfdb60e SHA512 36e43dc0dc2edbffc936f75232423ec6319d0fda9bdb8652aa555d4f0599f796219be777241fe2654a1737fe8f29bafbb9fbb80bd47e77c060ddc5b805b88085
+DIST kitemmodels-5.96.0.tar.xz 407272 BLAKE2B 35563933a1371e8c89da764286e6b2270d74b7bf27091d08b9910510c4a66995cc89f1bc30191eaea50338685c3ae40f2488ad6c04d6091c6d3d6dfa5868d04d SHA512 46e4380788f49ff79c6e7a7d372c6e451a83ddf349e175be41fb9db5311399c342e5a1e3dbd268c05b089d49700157d87b683dbf894be25b6ce8842380ee6a70
 EBUILD kitemmodels-5.92.0.ebuild 623 BLAKE2B ac8881df36ad959cd3763260eea5a360997a824f92793be7f088bb9e134738168f57ed804eee8bab692e9a1be9d696d52aefbfc845812df2a836096edab2b595 SHA512 44cac7ca8fcc28c34181ded7ed9dafbc277da772a2fd14da46a4e6ca2747cf5f3779130341cc81619bd80dfb9a1dd00c68de70808f9c5bf566c0317e8f3d79d4
 EBUILD kitemmodels-5.95.0.ebuild 633 BLAKE2B c03dff1b2a9d876f88fe589507317065c2780585d13db8e4e75b24cb90153ea602146732f9cf485439ebeffc769dbc31b7c873b2ed818e3d6d6f78a581660ae0 SHA512 8d7f2a21016af939d712baad3a8aa2165bd594e6e374268cb36a0eb78ce19a31950b1ab50744a2b4629978b0112202b50463ed3d6ea96f5cf065e0b74cdf2ed6
+EBUILD kitemmodels-5.96.0.ebuild 633 BLAKE2B 92ba3926eb3f6e730923abdee60b848b3fd5e530193ff71c25f3f48cc593db1aa84bda3175a519f77027b849a1b7b08410d0a3ef1e988b1aa650d23e36c70789 SHA512 7f7ef7b0aaf17c294ac858c9ab686e487d7696e2af5a40ad3fff70ae5e228582fc2b8fc7b66d491ff775b47d718ee26768ad9f7e6d7858b4aafa041c7f2b09ac
 MISC metadata.xml 552 BLAKE2B 5cdc5875ea809e9597a8510b6c427afadb94c1f5673c2787d8d825ab1b1609be3f0ddfaaccd64b717f188c7eaeb44cba90ad8beef3653844bcd6c1567b598a90 SHA512 ea592f4380f95578d9c15487498f8600540e3f41d4702d63b13a34ef6f722dcefe70677e5026f507ae04b1a97d29d91851e0e06dfb48a63c3dac98618f08ddf6
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild
new file mode 100644
index 000000000000..a14df576bfea
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="qml"
+
+RDEPEND="
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt5Qml)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 708820
+}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index fa3afbe804f5..1b02b6aaac30 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,7 @@
 DIST kitemviews-5.92.0.tar.xz 77260 BLAKE2B 85aee7a8ccadc939bde8eae618aa8ad26199e4f50f1e51c65bb4f1a87908587eba4ae553574153337ed24075f7043e2dd315566b4d11e12029bf157d83158611 SHA512 3eb1737285f560efcdca52ec8c02478cfd8151852ed9e4e931cd019617bb21dff61f2cb65642a278b1aff60afbecfed2edf867bb80d332de98394152bf072324
 DIST kitemviews-5.95.0.tar.xz 77332 BLAKE2B e4617c8e2a0042c0e784b36f62a47e8d9cdb76be179ae31ce4c8fa9dcf3079f2c71833cf7604ea3ad771efdef48257d4bff24665722783f2dea8f57a4ea43dd1 SHA512 12e2b0b52e322518ce3e9fd93ae11aa19962a6a06d45339a7578f2cd250090fe2fe4b0fe7366c5f2dffcf0a35996ad2f0ee69ad949a77b3dcb92b93c1029cd73
+DIST kitemviews-5.96.0.tar.xz 77440 BLAKE2B c1b8baa6d2ce0a47dafcc1ddb54b91fb27e3537711b1961566bf1fde19e301f4666fab4e22a283b1a55f61edc6bbb147377113b3de2110ba5513c71b2d75e18e SHA512 b1ba1a7c959436f88ba176cbba1a91eaf4453ca91b9dc3bc7ffea026a83371d6377475fc9a6a8999edd3d330a8bb57d266f1738e2be879bbcc651cac1ebbfeaa
 EBUILD kitemviews-5.92.0.ebuild 487 BLAKE2B 4fed237e97a3b928882e4160e3ce07de32755d2592a2e3cc7520bcac7d4a5424264897a09bd8e44a8bfea9cfe52505bd5154d8613c9c4b0ac2c5794e375413da SHA512 4bf30cd69a68e188a7389c7c59b7f16d88499a57b5d1afada41221ce66a4872de0f09d00decdc088dc8d7fd7860a5dcef8176e8653dcdefb57237990877fad2d
 EBUILD kitemviews-5.95.0.ebuild 497 BLAKE2B f22ca6b2534c0925a2cfd0941605d1e2b97ab3d2d9d3072911b65f1949dc703db7329426b3a8e0ebe23ae08750ec058268f38cbf72cc4d4446a0494f8538f8d2 SHA512 c7beee720e2454370202242b75e06cbf352d168e4cf2d6b13725e7ccec5a5e4e3b7cdf58b12458c58ec6cc985712b521e0ca634d4f7202953c1674e52dc5bb48
+EBUILD kitemviews-5.96.0.ebuild 497 BLAKE2B b115f6ffc9b9fa297b2068c02399ab531aac715ebff9c60ad6061905e0b4016f5b9299a3edf3148dda030e462c5bde97120fce9bfea2aaddcb9d803f8850a1a4 SHA512 5aa3cf48a73ee9433a37846cb0069790c6aee95389a0247e2145bf41e291c841dfc684470ec33b4c37217928db11ca614e0a9ed7710aa583c1cd554dec60b38d
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild
new file mode 100644
index 000000000000..32ac01b4d00e
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index f3bd132e1aa7..434d79d72216 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST kjobwidgets-5.92.0.tar.xz 101620 BLAKE2B 29eb6b131ca2c858ee416afab137ed84b1f1e00039673794418bb352ed656df13e91e2b47a98d1b6dd933034e0fb5dad44fa021aaa6ac0c84913f8cd733cde1f SHA512 6bd21dc93146ded88981bf61c1365c333c9ba369ac358ef4b5b06c2d26f0e6cac7880ecad27cd7cd950cf1b502c9202ced6c66fcdb78b7cacec1da6a92558976
 DIST kjobwidgets-5.95.0.tar.xz 101616 BLAKE2B a5ac8a7e11f0b79b1aba45bcccf23a80f6eec846ec87681203816663fba66006383bd8922d2222b65d9399245ae59282b055d54da50cf833c3c061eb6c6d4190 SHA512 6768bb076762a7e7cf223e0e73a9db10fb81bc3d48aebc095521a4dc18e74783468cba07a95b693f98011c22d1eac81d1bd0483d282347bc4978959718c15d76
+DIST kjobwidgets-5.96.0.tar.xz 101704 BLAKE2B 98f647b2bc7266364c05f5e57ddefbb60b8a16260f83abac4b33d7819987b2083029c14d78e49f6cd1fd5e087a343b11893e30d45c496e345fe98d67465055b5 SHA512 17fb818efa4f241a3e8248b81ba16c3a879b0580eb3a33efc19983faa5b39959e0cb1032b9044e953accd13ad93c028bfc619c49b26076416f707e6ea9480510
 EBUILD kjobwidgets-5.92.0.ebuild 779 BLAKE2B 799eb93717845cf4301b8fbf639c69f3e064bfc4d9689ae6683c76ac336d25812d9f2f658202b8f7cb413c99cf19a0f4d041766a00e092eaf4e0a7c189f3d7cf SHA512 ecb9ad26a6feca68ac8fecee6a7873fb103f3a83ed35b82c3004917c2431b357ccf363a7ec2293d913810ab8d0c0f52e024a8f3015b5f3fe24465f6a88b68afc
 EBUILD kjobwidgets-5.95.0.ebuild 789 BLAKE2B 531741bd1bcc2b40f028935bd44d5d698c5831f464d0c74f4a17cb137aec5debf714940a050ddb89ffacf9e1805d5170555955366d57eba99de397ea81d0f2a1 SHA512 21904b1f0e99f9b8bc62f8aefc2f6988dc8697522ae7fb389e859fa3fb0d900c892c6390fc1e676c252aab8d77816ae4d7cdbdd577f6564986e1db7875e78191
+EBUILD kjobwidgets-5.96.0.ebuild 789 BLAKE2B 5c343c9a9c19663af5e4e12b00e154a6bf4f36392173084be5ce108c03821c7ef2532590efa027c7bd25d06f13774bacbab3c314b333eb017df0df6aff922a1a SHA512 d032a85282ffe00a696da258a1a07b59316d8b3726a1492d9ba3798ee4a1899c17076add70177587c0f0dabe6198f6a276611787a796355b44cf3f588bc65eaf
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0.ebuild
new file mode 100644
index 000000000000..8372e6be035a
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.96.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 59b75b68dd77..616a4379ec2d 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,7 @@
 DIST kjs-5.92.0.tar.xz 339164 BLAKE2B 6b62d94204d99edda3143dd13762deebb3322502bf5743b3464dc03c4881d77b813116c4dc5da8da0a98cab6058a35752c18499d67e68ac1ee8db2ca029dc164 SHA512 80cd1ef0ddc4fa1616ed992a1891603ae3588b4c09adebf2bd59609f6cfe203894f11eff8351aac679a27f3e98b370bbeff4e3155e0bd308e7af5f9e4bc757c2
 DIST kjs-5.95.0.tar.xz 339068 BLAKE2B ab9f6ee9bc18098c15aa95e4be4ade54fa29afcf9838dd90e04cd2e190ceb0e2574a9f958431dbd819e655e0b08c1937637499d3832abe107d59f85570267840 SHA512 3992b9ea1f8a4b59e549d1345d04b3c1c04462d86d2e5635deed8882fd63b690f63d02909f0400bb4e101f7df1d289b1efc030cf265a712a4f39962e018792a3
+DIST kjs-5.96.0.tar.xz 339216 BLAKE2B c229de410e94d453f42c901f457b886d20249344a79d8686e5054ce0542cdc1b5c0cadba255801bda5b58413588ce86dca153515f8458eb7e072697ebd96c459 SHA512 38f393c60f51a049e46fedc816b3c2c748b93592e12f4f8c56e333b4bffe610074ef64fad5c0122d54489b5d43902c5be390f38998e9ee538d62fcce81ecedb0
 EBUILD kjs-5.92.0.ebuild 406 BLAKE2B 7273c1ce87c89d000021a835d590664133d7b0c0e9ba5aa095d2f2c769998c92ca0fb90e276b2d607d3a559b9e258ecea9b86171acb47c264a2a6ec04d6dcaa0 SHA512 c8c771722df62e25796be5121d99bf38d840c7d9cbe3b9272ac02dfb9482ca3efa2766dd74f2c18fba58c647345fd909fdb0e389b3f145ce99065c923dc67055
 EBUILD kjs-5.95.0.ebuild 416 BLAKE2B bb8228752b5e6dd3cc1bba907f43e50288636902dc424fe7fd70974fb7809a8049b93a897f53347dca83e2499e394b27b6db4cbf14d5d89fb23c2611db68bcb5 SHA512 cbb88ac6be4faf09cf37d36e40441b60c759a1b41c153946dcb05abe0bdb871a5504a589015b251e4a906d3b579030a81a9c3a1f65e215a5a5a61fa9cfc329ba
+EBUILD kjs-5.96.0.ebuild 416 BLAKE2B bb8228752b5e6dd3cc1bba907f43e50288636902dc424fe7fd70974fb7809a8049b93a897f53347dca83e2499e394b27b6db4cbf14d5d89fb23c2611db68bcb5 SHA512 cbb88ac6be4faf09cf37d36e40441b60c759a1b41c153946dcb05abe0bdb871a5504a589015b251e4a906d3b579030a81a9c3a1f65e215a5a5a61fa9cfc329ba
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjs/kjs-5.96.0.ebuild b/kde-frameworks/kjs/kjs-5.96.0.ebuild
new file mode 100644
index 000000000000..e538e8e16504
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.96.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+inherit ecm kde.org
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-lang/perl
+"
+DEPEND="
+	dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9e994996836e..b7d8562380c9 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -2,6 +2,8 @@ AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043c
 AUX knewstuff-5.92.0-fix-valid-tar-recognition.patch 1123 BLAKE2B 6febe01e614eafc88b1c29c327d0c5906347d8d3db518126c0950134e8764b31d5145501c2068489fa0435b6263bdfc6899a567bfa6f82317b50b56e312cfa13 SHA512 4a216fc24709fb602ed2a7d7ed6d9e9bce66dedd9eb64f41f2d5e3a6363f916602c8adb4588cd3781c0383cb3f4732c332fd82adce8abac76ad2507b8c7be0f0
 DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
 DIST knewstuff-5.95.0.tar.xz 1155724 BLAKE2B a4b52c3ec3c3975fdceaf56b01eb8c243bc5de305cf14a081ab3a5691711aae24500fc7212282b37cc6a2ab9bd205c375307100506c1b0252e89649f0efed10e SHA512 d1ef25a32f1b534d46e3ce4141046c6d23585d851e14998fe55012f889ff390ac1b10655b2a1918f8f6c8689409e62147c0a85de7be85c93d602bf57c2a8078c
+DIST knewstuff-5.96.0.tar.xz 1159824 BLAKE2B 391226a61f8b7c23eb7b942a3181a1887d42d83bdfbc8d8fd45f593d8eb15e9fe4f98b8067d81430d84b1a0bc178a0d549a3f73b926bfe5358254100fa4502f6 SHA512 5fffe90a25adbe5d0f9d69694beba5f9fe0418656d190bdb99c1495b7338cec5c0374e8f38d4fe3801cbea18a7596494d0e651fdb628c9d4e13932627fe60a26
 EBUILD knewstuff-5.92.0-r2.ebuild 1391 BLAKE2B 013cb64dc992bfe6ffe2f2746acfe5e393a545f84ea4cd7996c1deb68924e1546029102141bb23893e8fd50d139643bd1c81d96337eb140e787a27d1046bc4bb SHA512 4c0a9a07e57946f26aebc7f2125cf28ba18b55ab63a0f326115082df3d223635b292d870c5da1c14c6f9b91f36ee0e20bf0e779ef87f8e0a9192752c12272834
 EBUILD knewstuff-5.95.0.ebuild 1279 BLAKE2B 5c0671b24c6ca0c5aa15ec1179b1957e06f3c890500d83ec58fe84e6f50808336cf7348ae719b3441ce6fafe68cfce057834972999b0127467e24d054ba37afc SHA512 27a061f1def09825f659ac19b29eabe388fc4bdd77bd51dd37e72307b6a61b51803081ddb404e38bf6a8855b52679d5c3a7b0f44d61b78bb3c6f9bcf680abbc1
+EBUILD knewstuff-5.96.0.ebuild 1279 BLAKE2B 52723cd7ff0ce57e1fc5c74232799a56d8324ec59e7efcbf7057f4cc2da639b9dd9a9dbd1a64c7671b15f5bc10313b315b112a56991146e8b900dbd2e4dcd137 SHA512 fe4f475fef2fa8328ff4a63f0832364f2ffb4e8a79ebca4a6b497383554ca31432a4c74fbfb6cfd75e5c8288569246bfc810faf62941219f0785b106a3e5e175
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild
new file mode 100644
index 000000000000..e10af6a807ba
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package opds KF5Syndication)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 141ae8674b05..4a23105ff189 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,7 @@
 DIST knotifications-5.92.0.tar.xz 131784 BLAKE2B 9c31e8f3870e1ae440d813bdeefdc87b48ddb5fd5176664f49dd8d31c429c717a8b146fa00875cb2f2d218428339dcfbee883ddeb127647e5618d0aa89650ffc SHA512 7dd5f6b798ebe5741284a5334b9056ce47f0b2a8a44b7d7e8e13de674fe77ddac85447491ece9a0ad6924f1a4dd7be72d80c39225fa1e674715ca103b48d10fd
 DIST knotifications-5.95.0.tar.xz 132192 BLAKE2B d083821d94b05c0f0e504afec1b590cd28f72a823e6b6bc373472071da88eb63130e0bd6d03331530a2676796b41f035d46b4ad2b9b588bb6cba9e32f6aaceab SHA512 1c2e297c46f4580443bc1ae285f00ec10949d467d381b9cb32f03f90f931ba6fa01044bc440a431f4577c242ec961f40be2a7fd61e6a27cb142b49dcd2ffb19b
+DIST knotifications-5.96.0.tar.xz 132380 BLAKE2B 6f0ec16faabfbeac68e70257501bf9faf980cb57ebb20a4324c3de7846062fe3cc862a289aff273e5b5cf9557bcafac3cb283d763f684940abfc026bb94a53ef SHA512 a38af9f7fb2d472589846e0b62ee56865f229662167bfc09b7e85ae18619fe67a71f06c4ddfc8da81093736810ba5db82ac91b5fd40bbb88357ff647d91746e9
 EBUILD knotifications-5.92.0.ebuild 1242 BLAKE2B d25aa79649963990b680e55c73d55f72d37d37902ff2b0aa50532191bfd602175292e803201c44bed80e0c7f5c7067a5a5a2fd1ad5534c757f74e175c9999aae SHA512 e1d6bb7982afb75313d0f340d98ddc5f29681ec07ec091b7ab970bb06a337592c1534bf07673314d1711b77ece35e4b8cf2185b1c7d8d5e2b51db60cb506a3b4
 EBUILD knotifications-5.95.0.ebuild 1252 BLAKE2B 91e58b9514f862431db6c4fcac2c30c38a14a074ce75059f053b266b97114eeb5b977f46bb1fc53015a7f8ba8229ab65ccc86be116ebdf5336568f4d5b021799 SHA512 b98c5e1e2935bb7884b5c273db8fc197d2a23ffe84d114f3a410eee48b600b91b840bb51bad4b28353b2ff50ea0c37be193623c68a49e03427158d07569d304f
+EBUILD knotifications-5.96.0.ebuild 1252 BLAKE2B df7cef90330c709182500f3863ccb42e7c0d5f62dc7c74ac4e65434d926c26b96e3b8743e01b58f22d8456a76e75c5b99802ef3cf70a30a30d822987f47ebbea SHA512 1ce7243277b1de40de13c5e54e54db56a217e67b94ac915d7090a32d1feeeb49b2abbf27d120263147bfbcfa7b1d150b76a7432a32ec4d5567ff054f39dd1c83
 MISC metadata.xml 745 BLAKE2B fe1817a1a42cd10fbbfd20a9ffe0764ea24ea14e78b9a2f1bf9094dc0ce205da471aa1dacc058a86b1840da374c985953da09636a3ee01fe1a87c623e25dd368 SHA512 56bdda99f5a96d9f615d341134508ddc6edeedf043a44b6419b8ac6c745c7acb24c9a13c3001978b7eec97199f00ba9747f4f9b0a0c5e149580e75cc07a9766b
diff --git a/kde-frameworks/knotifications/knotifications-5.96.0.ebuild b/kde-frameworks/knotifications/knotifications-5.96.0.ebuild
new file mode 100644
index 000000000000..0477f95934ad
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.96.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus nls phonon qml speech X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package !phonon Canberra)
+		$(cmake_use_find_package qml Qt5Qml)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index b6d1c1c42e1f..5f2273242648 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,7 @@
 DIST knotifyconfig-5.92.0.tar.xz 87380 BLAKE2B 835eddbe305e0a048dd1ebdf6f5419e23f3b1c6ca900a176df64da99de091c5f31586b4a3db54927670d41e11cd1e0dae84499147be304e0a4c9232aacec20b7 SHA512 1abfb1097dbeee31bb6ff9e6843002d020020196fce3b6cb1ab43e3fe4e3ddb9ca6565c9da9aa13ae8e205ec097b186f1c7d628870597b0f76f8a41dcaf1807e
 DIST knotifyconfig-5.95.0.tar.xz 87416 BLAKE2B 9105bfe6c862ee9710b2e49fa545f37ed58b87316a07251a2ab9edebd6a74e090974adfc4fc16831027c473b0ed4f949fe570466985dde7b1919117b85f80175 SHA512 f6d6c4bc9486c279ca22c76ebb6b333296afffd4658045d05b59d85ac4bef3215b6807e3bcac3890929f20520be82abf63d6b72757248736b99c7865688d194b
+DIST knotifyconfig-5.96.0.tar.xz 87484 BLAKE2B 38358c908c3bd590b04a9802fa9b2694c7db5f92348138f8c81e5a56a014391c56cba0fe8e476fcc8c59d980e31a7b64ccecf564c63bc0f46b0b2ae6c8783303 SHA512 b0f6d8b6d01b4196943c2527e6562c24515ee66da05ad94f1be8178db6a2be42338e68ba15ca2e76dc71014432f7054aff3a969d9ede67938dc67ee6ba5919df
 EBUILD knotifyconfig-5.92.0.ebuild 775 BLAKE2B b9f986764e87a226253459fbff017f2a25f98123d4ad9c57f39809efae0a19d379f368ad48433affaf83cebca60c881b2c7924fa326ca33b7481b269f3dc6f9e SHA512 bcb48231825568aafa164ece935ef4e285dc321828b478b951aa8868620e9c72d88cbe3b13b91bc5753d9cd2b83adadde70b4cd0fd4e2f0eb65601899555b812
 EBUILD knotifyconfig-5.95.0.ebuild 785 BLAKE2B f6e97175acc2dccb9e054c01c27575f04fe6052decff8dde13f514e665fc2209a821d6d2d2a9f9f3a402aa0cf682aaacfc5e0f1dc4569d8962c8125a129aaaf8 SHA512 43578a1cf791dc59934cf844125b0c199362dd3946ca935948616b2116a014bec709de69c5f8287b55fd90977256b4d74b05039040f1823b1475f7404f1e3cc5
+EBUILD knotifyconfig-5.96.0.ebuild 785 BLAKE2B ef83f89a06d94aa24eeb02060d0e0781a580b5dc86b91779a785f5c45ee285fd809e293fa406bd5557ccdb5484e0c70629617885566c26c56c44d020f11b2905 SHA512 fc0185fa3b60570f07878ffddfff7bcf4cb3613a10436a5c9540caa7ee03f4a397e11e7be96725bfeac7e1ebf9e78922fb2f6fecdbd8e4cb0c5b9bcba67d38e0
 MISC metadata.xml 603 BLAKE2B de97624d3f4f43eeffef1385a40736073d352f17204b1667850dd033193b66f15a32ad7d743ec6c27c0717a315c1372805d800263226308d4f099e580cfc4a5a SHA512 39deeac37b8b1e6533852619ccdd245d2d9cc7c6a36fbb8393412cb161ed0dfb6ab711bdd7fb38ab515fc6c7972659b4faeb2cef11da979d798b0a1f43c8ed29
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild
new file mode 100644
index 000000000000..1290dd41aa7c
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="phonon"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !phonon Canberra)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 073f42693264..75a787c131a0 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,7 @@
 DIST kpackage-5.92.0.tar.xz 141300 BLAKE2B ad7990fc56067e093aee2bc04bf42175bdd6fba5abeb513697f0114e751da33a310687a880f3690c05a557e9e1a340e01e04092907aa50e57b418fd346977920 SHA512 f0979289b94108708d21ad3a6bb574903d376d09f84d60d5cbaef10a315f9157fd750edecc8106ccb81297156965222455d82f70ad9a4f750d898e29f86d42b5
 DIST kpackage-5.95.0.tar.xz 141428 BLAKE2B e5c934c49320aba8c724caede6af4e2e4d8d7dd1d8087e9a8919c66a11419b71c4e9e5927ffbd8123ebbc3a9d9386ffe06fcfa03ba422c5d265da7d02187ef11 SHA512 cebc839d92003592434463c9c20937f894aa1d29e9385468b5e2f2312fc44f293157765bee9aa7d9e788220f95c6b4b6de5ed97c701332cda0dfc5065625f119
+DIST kpackage-5.96.0.tar.xz 141384 BLAKE2B 2feabaf3cfdc9322296d9cd6880c830f3aea1b69132c53dd1d93e4eb606af7163a9767c9c49c05192ff1b128e8b6e2cd45b47cf3c520dcc58b2af13e9e57178b SHA512 97133351bd5597a29ae4927656cd8cafd552f8e6203d8419292169f6c19fa4e5f227446393d8ed3fc4a4aac2dc3a8d9fab436dfd499774abc1bee0addb531947
 EBUILD kpackage-5.92.0.ebuild 861 BLAKE2B 27cf8308e8274103cfa88e77e4f2a590adb8c5572b40e73d63fb40de2e8cfa43524690ac2ecd5c8041be84766cc9aee733cbfed68ce517ad8dd2e233a4efb242 SHA512 412dc85cf28c36101c8ca8dac0f15e1df5ff8b24097074c9083f16509e415ce14d471cb89591435a0375e2c7ade137a1869ceac9d3d6f4f14aa9bc99a6ceaafb
 EBUILD kpackage-5.95.0.ebuild 871 BLAKE2B eabd0b8a011e3e48b21e4d005293876169193e360557f292bee481e6eccf4975f120b354eba35e96f4b12bd6c1691fab56e485fe57e372fa2db18225330baf0c SHA512 4a7e43a073ec33cc31ccc73763c0ef93fd4770f8175b5304baeeecf3decf31b4db6b7ec66a983d9f47d9be45b05dd06298a126347ed3063f49117d6a7c6719d2
+EBUILD kpackage-5.96.0.ebuild 871 BLAKE2B 89a77458b29d88eeac6b72193e449121fe8003426c7c00ea777c18ff9f3e23bdd3103bb77ceb02c209469d6fc9484df1a3e1701326a20ba3fbf6482c76ee2cb6 SHA512 12ac6b619dc77d9acd364f27ebf722b99f894200edc4225a3872df99bb7fd5334b68cdde1b5bc126e365640a498e83d18958a2384726ddaf2a5b4f0c5df8b41c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpackage/kpackage-5.96.0.ebuild b/kde-frameworks/kpackage/kpackage-5.96.0.ebuild
new file mode 100644
index 000000000000..20c2d111b34d
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.96.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# plasma-plasmoidpackagetest bug 650214
+	# testpackage-appstream requires network access
+	local myctestargs=( -E "(plasma-plasmoidpackagetest|testpackage-appstream)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index ded1c683b35d..867bb1a25e37 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,7 @@
 DIST kparts-5.92.0.tar.xz 196644 BLAKE2B f6c19779b94c9d83eac72b7edaad9895e8027747c93aaf5a07f24ccf3af90538e4ede6204c0eb605579982f63e5dbb0ead8aef404c4de235d58468bac3ddfb97 SHA512 6c7db8d4975856d3c0822e86650c31a222b6b7ff8a660eeedbd3fc952eb2f94e36bd5f9b6ec844f9310603cf69bb333447a75ed7a2cefac66987ff5e5676d1ec
 DIST kparts-5.95.0.tar.xz 196920 BLAKE2B 6934c6a00ff8b3c467be3bac4e60fd1798957f98475e56f7feb150d55e0b184e161d8e50c299575b2babb7f1ffd8ca8444bbf8018c2cf6e3b204e4fab929e151 SHA512 6d388afe676cdb07d47261ad394820c948f37314b4d7745e9ae621f13a65f9d4bc2516f05538b90cfeb40d5c06ed699262c091d30dcdd669c66bce53633e12f8
+DIST kparts-5.96.0.tar.xz 197024 BLAKE2B 7f8061af347001ee55a83f33650c650c42fc850cbc520d078582e3aa7cec2b6c40cf314ae9f9d692e57143f70ae4e97f362ad99a1bd81ff14eacb1dc61f118d9 SHA512 d1086f428a19abc3d880775a0c54d78fad7014b5f2f2212e4299c701f12ddcc61c64c09cb1db1512714fe54bdb5b7a6bfed491009eb44535454189b658af3602
 EBUILD kparts-5.92.0.ebuild 844 BLAKE2B 8158762f82cdf310e46c2d7d51ed76d090967a8b48c694929d188963b426e04ed919c99fe7cbc616ef2ce361151b43bcc7b5b374a8cf111de19cfb2468449612 SHA512 712158700215907134852195c6003609688463d9827ea985ccdad6db10234f0da03700d70819b3782a63f3688fb945f1d8054d8d4e830f7c4c3f81fb5b14b976
 EBUILD kparts-5.95.0.ebuild 854 BLAKE2B 0beba4ed55db597950754f0acb9bfea7a17cf9aa26ddf343ec7e6138b007e957684b2249f198b6ecc12d1e3b97e3829a8d5fc44c9f7c134c6463df5aab501885 SHA512 0a4ea216db8b9459a7a14912179ef9962c87111b35e197da465035173ade34272c93f8423b7142d82418027cfa78fe788e911ff2b66b161ff93521a0793f8b2c
+EBUILD kparts-5.96.0.ebuild 854 BLAKE2B 7436d636fb3afae52cfdc7aff183588d6ccd090f96cf8c35a550827526612d398d208d5a365404dead2e4b2223b31ae4eef09d3070a74b58c6ef290439d5c428 SHA512 87f19a56d1384062913d9ea3d695f60d5dd521f8fce0491e54a23923516ca3f7f1ecbdd7e0dde26644fa6197cb5c67d496d72a6616edfb56635b52e4fdf3cab3
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kparts/kparts-5.96.0.ebuild b/kde-frameworks/kparts/kparts-5.96.0.ebuild
new file mode 100644
index 000000000000..2f9fb442d8d8
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.96.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 3cfecd3067af..76f800ac96a5 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,7 @@
 DIST kpeople-5.92.0.tar.xz 59164 BLAKE2B cf3da54a9380e4f05945f58e6c4d8cf8c38d50c7b6b951362ffcee7029558437918935a6657ad352a9bfa0980248027c876571eb0601ca5223412c5c0c908596 SHA512 63131e26ee0efaad30d5375677f7b5a323cc7e05f8b5d575534357fe2b848a1122f2e864621d2954c766cb7c6f9daadfb5da700c0e91afab703bd7864145dfb8
 DIST kpeople-5.95.0.tar.xz 60440 BLAKE2B 420d77be7136634a4b4c75cd21e9b76ef18e3562a34b6e44ccd8875e5ed51d2118f991381dbd66659f572b9dc81eff30b2ed0fae773fa9f9d0d07c10093417af SHA512 501fddcce188536113556688fea0a17bd0151ca825bde6fc59ee5d21cf8dc6af55ee418c03dae8b8e9b45fc8df4742d715fbae3747134e56bf7f1da28aef554b
+DIST kpeople-5.96.0.tar.xz 60456 BLAKE2B aee419e7d63fc87e22aab89ef50e88cb80aa9c72407855e9ff88b7741a3ba945e03f8bca6823749ddf53a639f7e118048f62df200a9d6178ebfa8612b6ec01e7 SHA512 22f6e38b06b6eb80fda535ce39d5481bf45b21bfb2ecb33a093b1d86dd8ccfe578e6b85e9f4001cf6f01131317b2074eb9f6dd474e6332c4f0fbe0f7e7a7e498
 EBUILD kpeople-5.92.0.ebuild 877 BLAKE2B c79d27ac34ab7f84b37d7f3681114f8b4e223422d874a3aec85b4e3d7a305217e9392ee6ada23c3c5963fc61829277d0b1d23e998503b9662db3996530bb459c SHA512 9b6d8f89802c1cc63c21343173fd5fd7599856b27c444d83610b87a1894acde691c7fc14ea5baf4a561a919595db440aba031fe6bd4f05bfaa99a8ad4f5b1e43
 EBUILD kpeople-5.95.0.ebuild 887 BLAKE2B 5e42b097109ff687185d9c39a43bdae3bbb0bd6d31367131d5df96f86fe5bb4c198118f2e3b3ad8c907ea9133528dcd6bdb6ec57538155c46861838ada9fb617 SHA512 b4c3d4f2d02e81d75f9260232f1abfc31a9d26e612563485468f58bb339cbc43eb3b47310c8f0625b35b62f22336856be0e160218a53729d157eb65334d75c58
+EBUILD kpeople-5.96.0.ebuild 887 BLAKE2B f7f1e0721abe38fca032e784b635dd73263070b43e8d49e42e1dc7f63ed8d6695dc853066b7a45334e2d34b9130c254228cc63886820591ed0386d0ef9d2363e SHA512 9ca179f875224d32c503e3d378456d2cc650106d5e6edcbafd280e0657c93b635e735fb5a50f36d6778cab4cd14d9f456477aa8657cdc9bf213bb4b3c3ce0cf8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpeople/kpeople-5.96.0.ebuild b/kde-frameworks/kpeople/kpeople-5.96.0.ebuild
new file mode 100644
index 000000000000..502ea78d04fa
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.96.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 12bdf88fa268..d3584bf8c52e 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,7 @@
 DIST kplotting-5.92.0.tar.xz 33684 BLAKE2B c71109a70dbd5a79bc5e0416d0677ee4de55fc51db4617ec0224bd65141fa0783c095a39847e16f95ae785d8792dc26067635e223cc27eef8c5121a85a0d26ad SHA512 e2f7507caef50f1227461fdb4be8a6ac9dcebe0f25d35357bb0c13f2dfb0f7cc33c885bbb7c143e4c61ee157570e907b9c51764c4c2d51d2831281d16b1603d7
 DIST kplotting-5.95.0.tar.xz 33724 BLAKE2B f2662c9df311a930285df0b48bf8140ee6694c5f6d3f1eef946106f9d9a673c152fb4c58715affd62ee73f161afe6afbf70d861cde01347c7acac92b503deb0c SHA512 612feaf9860a8a1a73897a5d4dd4468c72b9b347b0aea6acf48041ec067d79f8d504d9d8ca5207984c8c18a4989c8af776b91fb28cddf7a5618b06b54ad206f3
+DIST kplotting-5.96.0.tar.xz 33704 BLAKE2B 6b305522410c60cc60d2b31d528617222fc4b460afa285d817e54202450209afd99a7336b4987c66c003265bbce2637fecb1a59a5c8b2b0ee71b603e4cd3457c SHA512 cc6062806b757e4594e74aa134432b8621f7d118c5a749e782b1dfb67989ccdfd45694ecaa3351c9641b399cba4a4260788cff8673f5a7acc44341d9be85ca10
 EBUILD kplotting-5.92.0.ebuild 444 BLAKE2B 77506bb22bc5020c4b708c4a6e64fe7408a2ec5bea54263b196a550f824ce2190f200323a2b730ed92f21d42108e5fe612d804897b85049a996bd32582d80330 SHA512 b1baa6a2887c65aa4964ed0e6dbcbbb25bca02d8c0708725936875c8ffa4b4f48813c3e176377b3de499c49e0655beed6ed812e7f27fc51bd3459bea1139e4cf
 EBUILD kplotting-5.95.0.ebuild 447 BLAKE2B ed0c8c76d695cbe0d643a622a3110beeebd92475865407539cf7dc786aa071c0512fe1c9718710b7365961daeac0e6be60d90aa43f7b887a1ee7c54f5ca94426 SHA512 68e8a70d44a36387bb21280ac8c5ee7d4da3ab824f7343fce694d38e353bc5a77f239d00041d255125afa10ded8044322b77361d86387262bc8454c95442fe30
+EBUILD kplotting-5.96.0.ebuild 447 BLAKE2B 844a4766f1d6c77a9279136193c7ea96aa559a67548c1ee64777fc9dc1cabd9cd0eae033662fc6e7a7375bf4edc32b314908b3faf8a165ab31c795ba97054b78 SHA512 23ef64ee0a5501cf724938b264b593bb19f8a3fb814c74182b64774971db3cb5233415fc81c1b805dca7429a2d79b34ad1ab0c7ad70bf06eb95bdefaec04355e
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kplotting/kplotting-5.96.0.ebuild b/kde-frameworks/kplotting/kplotting-5.96.0.ebuild
new file mode 100644
index 000000000000..0fc9caa7e29b
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.96.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index e33bfe3ec00c..c718ca4511f5 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,7 @@
 DIST kpty-5.92.0.tar.xz 59040 BLAKE2B 3aacaa70e7b3c0afec1ce84120d48beb93dbe5f36ab3902a77a4138ffa4e0a95046b3cf3417eb28fab0e07dcfb1036ec25968a54b36a86b04082e14ef385a870 SHA512 b59826079f3bdbd6ca7d500c5dfe14fa8ef9841661763df5830134cdc729bc4568d0fa48910e5084d50c34cfa900ed409fbf9d5da0e6a35940c14a93fb1eb457
 DIST kpty-5.95.0.tar.xz 59408 BLAKE2B 2aca588e22c9b66f650c2a3789f23ee2b1b1d61092752b9179b42f43d4c36c6aa5d643957713df614f04194477e3a536fbcb56ee2b04dabc163aaec0878c9c39 SHA512 ce668d4cb0a99af3ec176e2583308d95c7bd253ce2ce251a7f98fc316f6cf9a745dce29ccf8659df587cbec4a86045e0206c770575440d7cf78406926d182407
+DIST kpty-5.96.0.tar.xz 59400 BLAKE2B dba22a68250127a793938dc5c8f22e93b05e271af7ad1179a2bc7adaeae1fdb078a62795f4d5f23efe4fb2e3849666757bd591a485f60e1889190282c3b075fd SHA512 4801582c18632aec29b116dacfe63785ba534499d0d16036b1ebbcf9cf91495bc65a53c2cc7a70b56d1aef9a360ac1b803f8f4c0fbc117609a8f728c8beebac6
 EBUILD kpty-5.92.0.ebuild 557 BLAKE2B 41c87cd6ec78afe592b1fd40a0a3b07fdddc02658fd11a0904bb743d2fd1db7cb9576343a37a1e4bf94c4c1e686036370d035fc115b61e5555e7ccda252993f1 SHA512 fd33a3e8ceea6a1782c03bc0167e3cf364ecb2551cca61775122c7bdc49ecf68c7d8bed1861ebbf9e392f85aadde6c87a29c012a607a0f3b20c4cd8a631740b8
 EBUILD kpty-5.95.0.ebuild 567 BLAKE2B 7ee586be947e7918739cb5dfc53deb5e5f10331aa45ed24bfa5224274a036ec633ba480757eeb9998db6a874353183002f76ae8254702d7eaa580da789db36a1 SHA512 32fe034e758e576ea13a34b6024abfbf08196e0aa8c1ed85859c117256e7fa6d77d99b2ddc0a42be2fe5ea365f4cdbbdcc1418dc6cc6f04b8644f0e394353831
+EBUILD kpty-5.96.0.ebuild 567 BLAKE2B 7ee586be947e7918739cb5dfc53deb5e5f10331aa45ed24bfa5224274a036ec633ba480757eeb9998db6a874353183002f76ae8254702d7eaa580da789db36a1 SHA512 32fe034e758e576ea13a34b6024abfbf08196e0aa8c1ed85859c117256e7fa6d77d99b2ddc0a42be2fe5ea365f4cdbbdcc1418dc6cc6f04b8644f0e394353831
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpty/kpty-5.96.0.ebuild b/kde-frameworks/kpty/kpty-5.96.0.ebuild
new file mode 100644
index 000000000000..843dd8ab0833
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.96.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index e9e7d8cf3b68..08241f60641d 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,7 @@
 DIST kquickcharts-5.92.0.tar.xz 108900 BLAKE2B 36e2fef1a5a9d32a4680a2f4c8bba55508e6212050d4209be1589a962380ab03ec84d8688a61ae4dc5dbe75aca5e901f7e2fd42416e4c13bafdb369854d81135 SHA512 0e5ce7bd97e9654856066ce44068c7573370d4e33fc708d38a4350d15ec35d2a078b6891d6cfb22321e082b979301f5a03e82bb9268a5aab6b3958bb0a0a54af
 DIST kquickcharts-5.95.0.tar.xz 108876 BLAKE2B 6a5f8d0e8924f0f1ba51ba3162d654683802a6ad52a139f0b389f52dc7b281dec89f0ecbe99df8b4d722aba42817c56ec919a625730a057294645fab93b91782 SHA512 a02f862e46d26563f9247b6b98c665065983be7efda62ac7c19bb634406a12400b5b2ff090db74157933546deed8a16c53edce56753989a95e7ef0ead8364693
+DIST kquickcharts-5.96.0.tar.xz 108884 BLAKE2B 3e0408144290b620092ca81b85b2122951e6a1a5a90cf88e4c00f0df35f620d2d5e1c2fc01cc717342e6d49d5ba2439026113b990840ae2097c7ca5fcdbcfb7b SHA512 306b4794eb44b7480a2cd85274d99b070184948d6bdc4a1f32c74360bdb5a48a25ffa913c743589ac58d10602f35708fb50e9111f7fac6de74b3986f9e410c7d
 EBUILD kquickcharts-5.92.0.ebuild 805 BLAKE2B 4c6e999ad6067cde0d127d7c62ce490772c0df862caaf53d4caec414246cbe109f49b44fa6fc234ff743dec303f58256f2e99804d168c336e22f527c8b64c1aa SHA512 daf8d46243c2b5de0f99525b5dfb90f89418cf4dda28bb471fcb8086ea9ec9fd987d035708e04a3cb02a602bd7db607cf34e718368ba7b1261824d06559223ed
 EBUILD kquickcharts-5.95.0.ebuild 815 BLAKE2B aaa2eabb67da245c0566ca1bbb82ba8c346c73f1dc12805f19b64c3275e41c69e04a41b6d3b1d4546b3fca7a63a55e9f6609ebcb41cedb889c7505739af68815 SHA512 95179b75f871248150435c905dbc98ce742984dfc3f477bbb9a930706e659a98771f7e9a9505ba28b388466b34e62c55cc06b01460804c043a97586af50e8f53
+EBUILD kquickcharts-5.96.0.ebuild 815 BLAKE2B 0dab43b3d4d76a8598f694c58f6e4bd17843389507ab5f7dd1394e4c2524efaa2de603cdaf9afcebaae83590cb3c903214592b389fce2515131efbfb13795f1b SHA512 c7fd86b7f75a012d5a0ca6ee3a476da1ac86e6fb7d5a8d467bf031328753e120d757902692fd0f66e5de6a41109d9871687b28d37c274f5b7e8ac0fb5e2d6d73
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild
new file mode 100644
index 000000000000..0fe9cb743429
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	examples? (
+		>=dev-qt/qtwidgets-${QTMIN}:5
+		=kde-frameworks/kdeclarative-${PVCUT}*:5
+		=kde-frameworks/kirigami-${PVCUT}*:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 366adafcad39..6419c390086a 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,7 @@
 DIST kross-5.92.0.tar.xz 129416 BLAKE2B d32c595cbaffdf93ccdfe0ad656b738ebdccecc4fefc559fd9dbf19837d2d9b659637e9dfde52e25634e3dea74f409fe7369b773fa964cfbfe4b07aa9eced6eb SHA512 f899ac754c8d75ac7b406d996ad5a5deb560cd6215b9e5038fab3d51229fb89409f5b09b6ecad1ede7c0a456c152e7fc9e58eefa6ce9109c8359a1bb30703e7d
 DIST kross-5.95.0.tar.xz 129420 BLAKE2B 46df6e3246244b1aff1ddee4044d63c8e6c80e9dbe88d840d391aaf1c7d6981989b1fbd55100af98261edb58bb4f1bd58b17926cb97c02b519f8a4a643cd01dc SHA512 42a527a9b4197b02161a4d67e14d6e85ee29568681f0e5302ce68f6faa242bd8c10ae6b10a208add8363f40008841df534784cf1fb97357ec61356e4261e6bc3
+DIST kross-5.96.0.tar.xz 129452 BLAKE2B c18d629bc8b4234caa0df184b463c310da391f61a6363f902e53e1fe2f79b236409332aee541b4176720bfef9a85ee0a04621f39a6b1a4b81dc064a6d080f8af SHA512 dba8d86d1c4cbbeecfe407643cce9b545171a3123d7ce5f73aee74941ce256f6901af85796e8fff04d4e6e3a3622862f615d189885ec06d9d0e7dadebc31e732
 EBUILD kross-5.92.0.ebuild 866 BLAKE2B d5843b27620609ddb2deb68dd9a42e7145126933a085d6f1d391f4ea88f267c2c4be88898ea54b6a88f63b527d8ed14ba75323391cb804e02ab7b0ae6af14490 SHA512 b98277cdf84810d668efb8ee2bd1f3fcf1eac136b95733ea28f69857ebb4d1fa26be44fcdf501476ff91deb8520716704164a3c370ca85ed3c48523e203d8021
 EBUILD kross-5.95.0.ebuild 869 BLAKE2B 6d52945b24ba8b2c6dfcb93d6eeb73db735d1f90cf84515bda3d0849c64dfbcc7d1129b69077305650484ea13651a49887ee45a18833cfe381a6d862bca4a176 SHA512 18974866f7832729b85df6ba3334c5f22db19c1b67352e411dc02ce7247d9075808f0b7681345ca8daf602557b4bbf615152f46cb9c642052e379ff9d822cb7e
+EBUILD kross-5.96.0.ebuild 869 BLAKE2B 2aa1b4df7235c1fa25999ff282ccc9a6eacf3bb5ee15ec43815ede0dfa5672d5b41fdd29ffb18a7fb145064a6dbbc8822c529440045e1776468061fddac0411e SHA512 386c95cdc7ee1f61409b1ccaf79447aea45a76c3501b5d421fe0d518bed545263b72fdecb716aa61cf5d81adda3d89e2b6e047f3ffd5032ec9c949d2b7cd5769
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kross/kross-5.96.0.ebuild b/kde-frameworks/kross/kross-5.96.0.ebuild
new file mode 100644
index 000000000000..2c3be4a01cc1
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.96.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index bb793edb4bf2..8899e153a363 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -2,6 +2,8 @@ AUX krunner-5.92.0-drop-runnermanagertest-timeouts.patch 3358 BLAKE2B daadf28ea4
 AUX krunner-5.92.0-increase-runnermanagertest-timeout.patch 1080 BLAKE2B c81f86dfdf44a4a3f54caddf87bd3eaa802549e3d53c19284b5910d73036b2f4f66f3023665d62cd4a0b8831b4725023c07d4b8c5479ea1674bfedd181baf605 SHA512 50d17e56d2a34dda95e3505318678fd83db6f7ebf1d3d00ddf153b134d8bf3473d2127f81232e44d235fc43da5afbd575998571b627142646011334b3a6cae7b
 DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
 DIST krunner-5.95.0.tar.xz 87344 BLAKE2B 4eb3539fd6664829e114c63bdeec9dac41eb1a374531a3c9dfd16671f8bb7f4bca7a97b57d35fb2df788b68b48fb9196ec778418dbac069b0e3971759a3dfa83 SHA512 f8be80109af811c9c2c30c1751d9e126c99d36a44821a498de4ff69ab035caaabdd3273940594a7a576e6f5532aa039824d7599d3106224bca01440a1bc94c41
+DIST krunner-5.96.0.tar.xz 87452 BLAKE2B f9a81bb88fc0d02d8458b01fde2e55cc6c9042e9d33d29603f3f3a38165bcd0a6e7e590614a4d92f59f0d741f4995614cdce726a7f72521445f9cb88aa865678 SHA512 fb25fdd554d56ee5b3b5b31a2feae1df8f37e1c434101eda957548b954b99e13cf25be46e03a43b73771ed7935750228b2957d654e06cd5e810353ccd264ed48
 EBUILD krunner-5.92.0.ebuild 1313 BLAKE2B f9d32bcdc233a61145c4e9968c765cb3290afcacd6a6156da8f56c384b334e7016b1ceb327bb498d95be63d83624643bcbb8e712e0cbb0c8d5ba42c40a3a8f68 SHA512 8903d3d7386c793154825de5fb19be2ffbbd22c34719e699936c8875909a22b38bbbafa0ab6edcc8b4790ade115534a29b573d2ae8dcdd3194f22158e10baadc
 EBUILD krunner-5.95.0.ebuild 1191 BLAKE2B 82b72b4bdcffbf5568726cbb5124dd5cd93207133846b96924bb8446e464bb960686204a61d2369d64487e1594586745bab229627e3f783b7121db09fdff5d5e SHA512 f47621c3bca95bc3ef70b1fa91586ce3a6457ef90599e08dfb31c017edfdb44e5fa1ed3a9866906c569c124894237870b81fdc2e0f137d28685df26fe2c755ac
+EBUILD krunner-5.96.0.ebuild 1191 BLAKE2B 9c693fba0b1b8d9e97be4cc69d0fe913727f41bc53b2ba77c3f7b8c946a3c1a21100bd08d042a63e1022a159538a547640de020e74297a241e0a927c06ddbdca SHA512 29431e6203c8ddc801b788b0c34bf5bdde6185c6be3981447d23ddcc1a5be8e6b9cc2f21a745be904a77c7dac50fd1810c754365fcdd8dfa54a8dcde3556d73e
 MISC metadata.xml 552 BLAKE2B 6fc263110547ce6552754eceb08fa408b798642c8525e975ef326a154776129839872f1f66d72b499070b18af12f0dd5a84a8dc06287648c5fd00602c1a72ab1 SHA512 ab8b303f3c07000e126031e092019f3226cf59b191c221e1de39ce32bf44fede7918516be74bafda1886154026d1504c0ad3652b8ae9efe65831f09fbe8d52a8
diff --git a/kde-frameworks/krunner/krunner-5.96.0.ebuild b/kde-frameworks/krunner/krunner-5.96.0.ebuild
new file mode 100644
index 000000000000..3e4be15524fc
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.96.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="activities"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/plasma-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	=kde-frameworks/threadweaver-${PVCUT}*:5
+	activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502
+	local myctestargs=(
+		-E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 5d3f1a98a334..31cf91123228 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,7 @@
 DIST kservice-5.92.0.tar.xz 267336 BLAKE2B 9ab32695b8a32e8d56463cc0dd31d6f1c15380c75c502d9e5482ec6dcfa9ddb20b3dd795d327babb73186b47958fa10d9e5f25433456a9368210d90de5afd6d3 SHA512 e8673d2a3770557ef421f5ac37358066903f7c5624d1ced317b29e5cc34b759da4ae4bc1cc90f195427a0f0257283a804dc606afdcecb494946b2f3c8541ebc6
 DIST kservice-5.95.0.tar.xz 267660 BLAKE2B 8a6db2efbd0f92a0e37b00b48ec79fb0d7de8fa5b0f53c3a773cb1acee0f6578009ee7f58f553ea6caedbd84ef1e699bd7457909a9100fb3752b04d0b27d830f SHA512 ce88817238bb8a671b5dc94d934a7dd4df8ce794452968836e60d6ad3781b1d3a25908f82c997a918ed99243579d394fad4a40955653881ac03484e054e8a763
+DIST kservice-5.96.0.tar.xz 268480 BLAKE2B cb0816857bffa7be18f7136959272015324c6990b5eab94e8f2f9eccd451ffb98d5d17dd8ece00488c45f0895007c4ffb8b77b0695a46498136a0417c373d719 SHA512 ff8f0932574de555626944954a1b7d3bc6fd23fbce03ec8749d6f0242f5e75406c16687c3b6bb9d1cb747dd17aa4c3560164e8dec78de5c6075f532e6ad2e609
 EBUILD kservice-5.92.0.ebuild 1013 BLAKE2B 70426a3f3696c14c492bf3c3f35502aedbcc439b6d816601e9606c8cfcc43c4c01e86c52d975d32b3eb98fb4f7ba732ab3820bb7d6584e2d75999002601e3a1b SHA512 05483b6d55983947fbcaf4a7183afcf32164923da4f99a1668f0c39092b0ee505cd324d3aa635a2d28d304973f333d4e0aa7efdfde5cc0a63bbb8f87e3497b26
 EBUILD kservice-5.95.0.ebuild 1023 BLAKE2B 4202c3c576d2cf6e9d931745d3eaa242ecdc8fb3d901fa8d377ffe16049e412b850b258b9249e0d0cdfbe4633e09986cef8aa41d811084cb4efcd8c1b739bfd0 SHA512 fd277daf7dc2559076484fee8652b8c4878384e1df9a135c1629ec4ec7bac2df5ad25bdab59be3aa159e62b36fc134c7f08d323e40afea10af9a0200382a791e
+EBUILD kservice-5.96.0.ebuild 1023 BLAKE2B 0a6f642d2557e76fa0c48f1e9cc1700e553dda39bb7d973e00b1985e030f740de712648294f170741fd3a99493c1f7e7d89eea9d2c6e0d01d1e9d0cd5b337949 SHA512 19a83957a6da49ee5bd4e9c202f4fa8a5b6c0ad3e917a635df238e5f1efd1f286ad7147a8290d38ea68439515572bf22e7e24760783ccc7632495ee6aaac6391
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kservice/kservice-5.96.0.ebuild b/kde-frameworks/kservice/kservice-5.96.0.ebuild
new file mode 100644
index 000000000000..dec1bb672ccc
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.96.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+# requires running kde environment
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 9c328d8ca369..7adb088f4457 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -2,6 +2,8 @@ AUX ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch 1094 BLAKE2B 803b7094d6dd
 AUX ktexteditor-5.92.0-fix-toggle-comment.patch 4843 BLAKE2B 7723bd5bc04bcc97779c04b34fa2403bbd0084fa26e2f92d83719216e36b4162660153eabda30bb1616240fc164dfef27118ece97633096ff1d711037dcbe3ee SHA512 170277709bc93ab650085f7bed3930cb391a5926da31cd030a0eb0565d645a7a028db93a12ed09ae88119730bfb5364f282b41a82557616878d04a8c0259986e
 DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
 DIST ktexteditor-5.95.0.tar.xz 2392068 BLAKE2B e8f8c8445b086aa24e9d74650ca2c896f65ed04f1c1618c1d6e8f9e4c04f0454a79cfb01ef66bb4364b323e846169fe83b7fe9d695a67de4a6b4bb6f75d1a320 SHA512 5c85a280aed0100c55716fed657bd6ab5d75674262d15cef8a71d169d50fa0fcbdb46d3c1602f9ff21545ab73dbf93a951f1333c6fe5e05d729de8c16cb1eaa5
+DIST ktexteditor-5.96.0.tar.xz 2404504 BLAKE2B 3d35559a25a111b3a21ea48f8512b237f343fe31e4cce5031a60b6efd3eb1f832255ed327ec63c6d5e81bc2be2f7eac3eb524ef7b354516273f070a5057effa1 SHA512 83528972d06bdebbd5f00ff17b40bf6f413b29590127ab7ef2d842bf7bf248e18dfb9dfef4ad3501b2689fe14d6b0444ee654a06c4f58a0dc23bdebae2f7ea04
 EBUILD ktexteditor-5.92.0-r1.ebuild 1662 BLAKE2B b0cf93eabd029c5831da8dfbc1c1dfd042687c05473a42417279665cabfb121ff80614b5e0066698185d2ea09e65a9d3757e475935052f9c9378f9b6aba15e2d SHA512 f19e21b3b1e2116ee64143eb2a79ba79670ea449cc152ddb964b0ded9abfa4184ea099440ad53aa54c2df3624567e1c8d270a8970dcab5a3eccfc00136e7c108
 EBUILD ktexteditor-5.95.0.ebuild 1528 BLAKE2B fdd6e619abd5df4b3ac970cd3c440ea0301e1cf36e72a6cdc4f1b7802626e05f6acf2aa3f7a34d12e90ec2e77a277ee6d2364f7e4825bb5f914521fb94cdb4b5 SHA512 0eb4013a65059101530ec2a222f73ecd1666c8747ae8da5866f3a1fb47fc0777d69a512314545ece6042e661d97628c7cd862c2f9c3e3f81caaf79f4ea5e9c0d
+EBUILD ktexteditor-5.96.0.ebuild 1528 BLAKE2B 3878cb6dc4e5315de52212b653b0625d4b9172bd68c35ea6b2578d01f15c88c0808aa4f15e7c3717a53066f5d474c47d95a926d002b71fa5acba1ce63dc48f9c SHA512 a6b650aae99c7811bffce415362de5dc46404aea519ee51c028d8c016bf13f95eb97f25c2b28487ef47e6fb924cad5b05edc5f54c2c8bd2f75a0b3c1c21521f4
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.96.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.96.0.ebuild
new file mode 100644
index 000000000000..06e37eeb2358
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.96.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+editorconfig"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/kparts-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
+	editorconfig? ( app-text/editorconfig-core-c )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index aec57e4af442..4e5665e2115e 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST ktextwidgets-5.92.0.tar.xz 329168 BLAKE2B ee0991f12d7e3a54b4e79b77327378e9c61544f5c5133f9bf838b3995ff828f2b35fa7489c6407efa08770911e47883587d519e78ef5d8e112483c744c9875d2 SHA512 7fd02eebb10b2929a6d82acdccba07a906692cdcc92f824b360e4be5643412b7bbb34772b8e6762e95c769d2528bdc873ce4fd03c8dbd5b5fd26b341ffce9e9d
 DIST ktextwidgets-5.95.0.tar.xz 329372 BLAKE2B 09750ed4e2f6488ce4a1d2899cef6ce561d70dcbd284de7c2602b32cc4d9b504ac56c56bd5612342b2c4fc673aca8fdf9cddf956fe25c2c9468ec9a17d1d9eec SHA512 63f45cd542d81de8591668922c63ca023f637fea0374f6ba15cd2481c6c42ab7748419c18f65c14b05d1801cc725827d2436622f5d40ee2ff00cca5b463eae04
+DIST ktextwidgets-5.96.0.tar.xz 329332 BLAKE2B 1689f7f9ef471ae0525b3b5c454a724e545a76a903aa41f8d0ed4b49c042e1f790bbe790b2c9cbd8c1829a8f0aae801a94a6cf0f49927a3790e4c20ce9a9796c SHA512 34cc2a4f2cb56449a8dc8ce439252e96a2c4248025ad5a4a279a3efbdb95460c49ef8f2bf871dd0cf3f1a6547f5d2d1f1bcf64696bfbb56e86a296cc22b1befe
 EBUILD ktextwidgets-5.92.0.ebuild 962 BLAKE2B 78fdddc9da064897c001d9fd7b122f4504565f0e345ebe95e3ac40126686e616286b64b9b5f7f44f2dfa2e05382f26d65250fb050f21da5489cd1f253288a790 SHA512 49d46347f55d9f10a3dcf3d0ac4ef88c59d8b681ed40f409bbd2415af8c624c91cd42a8c8cc6277122911475c211f17c0a559876db4cd5041b9e0acc37b9856d
 EBUILD ktextwidgets-5.95.0.ebuild 972 BLAKE2B f226d324f7da234831ab08c1f1ddc3ef0ada9acaa08edf82f02b6c81e1d94a1d86d042aa99647b54b33239e9811159bbcc01f7d352db50385f64bf14d27ff27d SHA512 b8132f33eddf6ce583e8936db91d33c9f5f985e152725d8db9cdda3088302ff775d58f39c1f568edb73a7742571efabb78ca3472ea08b36a4eaccb834253e628
+EBUILD ktextwidgets-5.96.0.ebuild 972 BLAKE2B d514087fd6132581b55143a9f84e3150041fdd6e4e95724a164f6155011dd5a7e6cd8884c91bbadb655af43a72b959100510d1dbfff32b695b9b5c7def732179 SHA512 f35d3e20da08d04f24b6ea83ab8a39c47cb67ef88c16cc9d7a439207b2802d91ed333efac19b0bf9e3b8a591202d290d8304935a37969cd19bddd138bfee4d90
 MISC metadata.xml 606 BLAKE2B b0657b12dfbcb381fbc777811260f4904059890473e420a0f5bcc82c9e785c0611f61355b665c57042cbacbf0d397f0ef190a152b9dced6c7ada3c7b024f4bca SHA512 b7d8f946e5fdbe0ba748f6236ea9273c95687909bd6d6306d722dffbfece7233aa1b5345f9b3033471f5772540a166439602dca828df8d7262c0035908552076
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild
new file mode 100644
index 000000000000..a9f9bba4de7a
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 518162d9c290..e7add350b40b 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,7 @@
 DIST kunitconversion-5.92.0.tar.xz 893192 BLAKE2B 7f6df447e8a61ab193bc14e56aef065106a55622f750f760b0b77b36f18f29677bd79e92536904d3d93511d69c13e8d46cd88840529b453f89241c37c427c7e6 SHA512 4d1d2028f392d35ca90bb79a2f1102e14807c28f87bc1031eb502122e9b9d7d69ba0bb2ab04581a2a378299cb3831b73b1457e4d25a49b29be55d25f48cb001f
 DIST kunitconversion-5.95.0.tar.xz 893812 BLAKE2B c05c258c1e4056d602d8fe8558e20b533076af0c47d371ecddd3cc2ed9f0992c1686bf229ed228b143c92f5363f4c5e873b198c4d36f1163350623d76c49aab4 SHA512 3f2969c97995f95ede02b697a348ab9e58ef7f012385be6ee980255594f6b257bbe5ff33877ada9a81f7fad05231620d82c8c4492cca5277afb47cf4131edfba
+DIST kunitconversion-5.96.0.tar.xz 899456 BLAKE2B 750bd4c70c7ecf29f9da9ce1a30c45c84d7b5a780661bb79079c15123cff6fe1b8a63f3f850037aa267163b50edd5db45a178ae212201c2985dbbb6873e03bbf SHA512 c3c61aee8edf12e17cc650dd903e3e2ff721c1f060ec621a55b3fa7bddb7494fb122bd430e899c26f2d49a5af83aa05512e17dabbabd077732666540a2f7d7fa
 EBUILD kunitconversion-5.92.0.ebuild 706 BLAKE2B 6210cbff5bbcd0ddbfa1c168ea18cf97bfc1fd7023a79d7164c826624482573e996b372f60786c19d96ee0d8127f425f800106cd78bc19e16291308beb07e002 SHA512 3de084dd973ce240743eb5f764580d496046a9d2b3bfbf6e6a34f1e3580d62c1f59624b110e46523f4aecf632bbac3c45f766142ef7f91e7743237ea46abc125
 EBUILD kunitconversion-5.95.0.ebuild 716 BLAKE2B f8572cc88f008bdde5e066bce9479a79b6e6a16ac02e8528a8e13be00f92ca545b69c31181b66fa72c65c3b327186be1fd1251c6915bcdaffd8f9ddb5a3981e2 SHA512 87bcb5da2582e602b736519728462b650041afd8d98725da20b276c34fe3e2eb839cde811a838eea672b8be8bb977f35add80305d3bae3e931362b7266f9b74f
+EBUILD kunitconversion-5.96.0.ebuild 716 BLAKE2B 0881aceeb189791e38d784b81c3637f76f6a696bcc4e05598aae2510ef09c1267a72a963fb62103c27b516ae36a80e3b7e48faa93966b3dbc678ed8998f37235 SHA512 be6ca7b15c105059c8ec47c0dd7fff74c158c11565d80d3ade43dde05f93b66e8f6c5e6cb575c83049d3553b9643207749fb1657fec7f72ee05a2d125780d085
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild
new file mode 100644
index 000000000000..b7b5b92c4893
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	local myctestargs=(
+		# convertertest: bug 623938 - needs internet connection
+		# categorytest: bug 808216 - needs internet connection
+		# currencytableinittest: bug 808216 - unknown, reported upstream
+		-E "(convertertest|categorytest|currencytableinittest)"
+	)
+
+	LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index c25134c43769..27e1179246aa 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,7 @@
 DIST kwallet-5.92.0.tar.xz 305528 BLAKE2B adf94a05ad064a02c5c8cf291014e554f9e432aa07977b08c97b5b61babff53e2e973c16b10ad5ab48cbd7a48b4b3afecabd576070db8076a0cfa2608d7588f1 SHA512 db65cf0e40a758129122e8320b1971e35de5e7a9b65248937e5b3c65063515ce3520ea2f32eb363d138d9c53afae39e2f86618ac318fb19d099a5fa38ac18c6a
 DIST kwallet-5.95.0.tar.xz 307480 BLAKE2B aed7ce43e92b2fb9d7494faca43b6c3ce807eb717dc0a4693ee8c512db9d42fd288104f214402d3ef183f34791f4dc0caefb77380d77b7f04d69be3484375b16 SHA512 c31ed480acc367ff7db25da0115769ae4e0ff329718be343a9b7565ef17adea1590af611c6f04086fe5ecc050e66d9eb6f6611aee71284422a86c2f5c7df85a1
+DIST kwallet-5.96.0.tar.xz 309604 BLAKE2B 59a2c5d77e0a7aafe27c76568b149b05a1abc34a0591bdce09d14d1f6a43e19edf453a6a140a07664c0ff42cb8df73bc732853094222bc290e15ccff84d63686 SHA512 ce84bcf07e6e053075960132d27cc1e709327433d61ff25cef34b886ec6ed885fd5a0d1c5cf3b74694698006b8d3ce231f7c132ecd12acd2c9f05e81e5d488f7
 EBUILD kwallet-5.92.0.ebuild 1386 BLAKE2B 9d346ef6a142876e06379a67e49a9b10776f71ed9a55545bfe77a6586c1963f90323a7da91914632e105520f6d245e0cc7d7069aab42a55862da4fc745404a28 SHA512 c88833f8c73663b7bf9da0feae8684bc8789845643fc697da712468feb619f3e6011083890316627f2441ca67366cf2887d6aaf408a25a572c5dcf4259be618f
 EBUILD kwallet-5.95.0.ebuild 1396 BLAKE2B bb986a42415b99ac6cf0f8c29dd19a34ca311988d7e96cdf6ee98d705148a5a1d4c2de1299ef72a86712ff3732622cfc1660e173bcda92595aec0534974946d9 SHA512 e2c193983324c6849d5b10a6fee18354a2acac6b9b08d568424d7b2594679ba5abb1a9307808f93d6e4e97ebae4ed6439a2bf09953d80538970ba0d95e2b4a98
+EBUILD kwallet-5.96.0.ebuild 1396 BLAKE2B 82e5dfe7431937e75f78be25d0f55c84687c61f949f38abc13eea267e428031bd4cbe79c2161411c9208e031c57d18ee00d0f4cbbd71c571defa26dd84e00bf6 SHA512 631988ee913344c70274589dee35f6b41a45df92a02f90d37221821428ea00f3fa2ba4491fea216f1c97a45c878ca1a56e8f1ecd287f503716c4d114c5cae101
 MISC metadata.xml 586 BLAKE2B 7ab7b780f8861068d289d9563a6a81ee660265764db00a7be316a1242fc56689af895248783ee8814b95f46ce35bfa7533d511b2c47b1170b46ae0ba96aa92e5 SHA512 f0d5748631151406a2baf5401386cf644a8d373651e44858f336741a8eecffe1b3c2967b10925fdd9490a050740b3f9eba781f2aacee13fcd211c3145c625a3c
diff --git a/kde-frameworks/kwallet/kwallet-5.96.0.ebuild b/kde-frameworks/kwallet/kwallet-5.96.0.ebuild
new file mode 100644
index 000000000000..3555f71c6460
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.96.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gpg +man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
+		optfeature "KWallet management" kde-apps/kwalletmanager:5
+		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index b64437e27092..05aabb1a9d7f 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,7 @@
 DIST kwayland-5.92.0.tar.xz 335360 BLAKE2B 57d42694c46b090fd62d1886f4818134f9d5e19f78665d4a8bf9f05572d5523c3580ce4c4f8da869371c2bf1de9bbac4d3a0d7fa40993b94291e12af2e4c9472 SHA512 982140987c5cb561c25afc2d8e573db37764fde1b87d395af0c21d8d63e9a6a70dd4fdac3b70881588acca28b4c45a2af470fd9ca260fbd9bd14ed4e299fa2ed
 DIST kwayland-5.95.0.tar.xz 335624 BLAKE2B c6e31c762187584ca567c890276319bfc0c23ccce4fca4f302a58291a8c1e4cff8179d2f720a3f115ab8db6f835cd1e3e79102da679e87925c6806f38c821f43 SHA512 8a10bdfe610ca9b0512e887637a8472bf650a6cb4d2a80fb102d7691cd6a85d6512bdb3feb52bc42ca7ee5d9d627c947b0a47e31d3a9852cf5a25eb7223c1681
+DIST kwayland-5.96.0.tar.xz 335724 BLAKE2B 5bf792ebf1c97651cd9d578ca9e2be7b54cfa85d211447bc1055c8c0731a1ee1d4f1deeb93e693d6630b58777ac8da57725fd60ccdc53551d4fecad0d9e27060 SHA512 f81ff1cb141039c0148949860f0d9bd57c9afdf938b838dfc91aa92d67f2aa5da6b4c19875637eaa050174b94008f56f593c18b23422e97856b301e9d515c670
 EBUILD kwayland-5.92.0.ebuild 884 BLAKE2B 6354d55621540c294d19496bfb9f484ccd4a52b9c9603c379b8db1535b4e99e393490ce45143eafc4781e4f57b47f64b1e1dbf839ff12bf0f41ae02e4e03b224 SHA512 8997a29c9c5c46f060b4bac0c596032087bc7187a7843d6c9667801fbfa49afc101e984d90196d320b13aab832fa5caa355cc3bf225810057abcc80bc1ca577e
 EBUILD kwayland-5.95.0.ebuild 894 BLAKE2B d3e9bc26eb9f4d8d069514820b083b184dddfe0958276569726c42606e62c9224397698c4742cf9108796eda2fe4aebc894a31fe7b8cc7d6227d5209072fd1c3 SHA512 513d7776ebf460866a70b756e999c194fb51955a753758eb1618bc1c29b27a55f899511f815a0335323bcf3baff807ebec482dfe19f5e1500be92837faf7b0e4
+EBUILD kwayland-5.96.0.ebuild 894 BLAKE2B 7ca3d3df9d3eebaf3648f7182bbc14073519df1449982d99648854554242ba1763480b19eb871af25a4ecd64f6e28313fcb7b0c3ab136318c4e7b4feb04e1a2b SHA512 9da2a8863ad0eafbc5321a5488a92c6044c95843dcc4728230e18c6a23f56ca4004f37d91423178f845c2ca5949002b86f7b196c43bc304b17615684f8b9556a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/kwayland-5.96.0.ebuild b/kde-frameworks/kwayland/kwayland-5.96.0.ebuild
new file mode 100644
index 000000000000..ac2fe608e741
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.96.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.7.0
+	>=dev-libs/wayland-protocols-1.15
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 7eeacb696610..a2d12f7afcac 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kwidgetsaddons-5.92.0.tar.xz 2313060 BLAKE2B d48d1be09dc65d79eb5961394ac5bd1f26c0613128c10faab45f5011131f7a2233733aaa844705f7905f3aede240ef6734ad4a68eb044af7531203252e2e8ca9 SHA512 a983eb8c8b186c0fade674516b6a99a6455d512c0ee243af5cfcdfb5733adfd9ca2b2e674959312350dfcd4faae8bc62a57cc356bd30b0420f9ed54db7bafd9f
 DIST kwidgetsaddons-5.95.0.tar.xz 2312580 BLAKE2B c0d187889f858e38838190ff29ae3121507df4c041e07d251aa20feb6c4c6d245cc2c629b1ad7e922f6cfd753fdba3804e57678f220d138320c968b37f2eac5f SHA512 1f79aa0f810574213c83c26ee454a50e52c08167c029be239d83f089858a28dcdd31720cc2fed606f319b8d7fef05743ca06424a1249b4fdcfebbf043688cbc3
+DIST kwidgetsaddons-5.96.0.tar.xz 2307896 BLAKE2B 428881315aeba33cb29b2835c24d9951f93e2314215f6d0015390f31b52e0544b6904002c0d97e07fba76f92a4bed927aeeaa565809f325ea8d0f6d62c2a9cf5 SHA512 4e725cb00ba84a862f607da81c4e0d18f8d7af51d302f5cac88d0301e590ea052942f16bd8fe2b34aab76cd03e2467da72c56c3a6a30b75d811a6c28d2edd308
 EBUILD kwidgetsaddons-5.92.0.ebuild 668 BLAKE2B 320d59f9ce005d27faad771fd748c0f5b54a7a6a27d4e5f40c7ed84843c4327b5e08ac13ed8d6d6e817dc0f8d96e9bc84643ee79a00afde156e016f9ee5a6690 SHA512 4e44dde14ba8b38a626075f043e0390ab9d39640286c1be4d52f01c51cac6b33455fe214eff7f7395769dd07fd7ff913e70f0df6e394ac2ef6052c66b295d5c2
 EBUILD kwidgetsaddons-5.95.0.ebuild 678 BLAKE2B c3289adc154e34c4ceda80fb2406b83efd5890db89be0439762bf89eeb8466f6fd9b4bf568ef2b8f8fdf352cd43c306e1afa2bb3cb614dcf88562b236a14b49b SHA512 bc8985f1e2d70358969b07b193a36246b1222867d5c40c3fae9c46ed9d0f9c1c6ebcff75c03c02800e21b1612c1067377332ee459e6d42b320cb955cca50a2c8
+EBUILD kwidgetsaddons-5.96.0.ebuild 678 BLAKE2B ca9b5b51b2770545afcdd9e098ee91a62f2ffedf5d9993b4c9f4a3265307cc9a74ef9fcbe851b219af6de1a99c4ff52fc99368d39232efb247492e69640d06f1 SHA512 fdcf49c4027157eea49fc1dd4422e97450e9514b53f57a4e774729d04a30673af99d51cf2fc482141948fab248a6ddc8a3485c1a5dbbd3ae56ccd81bcb733156
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild
new file mode 100644
index 000000000000..708a91f74fec
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+
+src_test() {
+	# bug 650216, 653186, 697866, 808216
+	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest|ktwofingertaptest|ktwofingerswipetest)" )
+	ecm_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 7f465ddbe750..6d85425300fa 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,7 @@
 DIST kwindowsystem-5.92.0.tar.xz 182136 BLAKE2B 0324dfbf0480bf91ab10cd35adf4b38a85decd463a7e14f94ef9b50ec34344c0119599c45c3148613caae22e5be6af6bf4d5cecf8d2674fad25a4d573d6c0146 SHA512 022f0a26ddd19b10d1f3365218030e148123ade4324c60f028a01f8ae96426a53de09d2eb60aa46534447da9125ef01b856d4efcd45d56ee5bb26ce784e927e7
 DIST kwindowsystem-5.95.0.tar.xz 182340 BLAKE2B 0823a17a7b6183c728943cfc502bb6e0c46f9cdfcd298b48f0fc2fa892b6606cfdb399f4a39bd4b0d982f15595a7c2ea56dd1e5f41c2bdfcec8dd13f862a042f SHA512 ed1df6fcc3dad2f8a318e7402c7e72f620523bc39ad54dbf032c6c11384c788b59ec075c83631caa473c6450504fa0564f66770b54a873aa04d8e2c059a03c5a
+DIST kwindowsystem-5.96.0.tar.xz 182568 BLAKE2B 320382003f4d840b39e54e8f1a36f4fb26150510e3a11c4af4c3bbc70bb8a9b57f2ecfdad53e8ea22347eae2a4035d68a7409354c360be0b9c8494359024257d SHA512 8d6bc7f03c8f4a63775b3457cbd3a792e285d3b180ed0098abd5dcef602f2dc9b51f906b39ca2c958f347efdfbe9b1fdc82e5ef498f0d522ca65782db7152613
 EBUILD kwindowsystem-5.92.0.ebuild 856 BLAKE2B 838e64f173bf54dd7df36a8fbae3b5769c54cb2e770696d5bdb0b18f08982b4445809698f37af39a8b06e564c068d34143fafc836613bf6a0bf906b26e59db66 SHA512 f99396c7c297b43044ba5b9278bd3eac72260597420e29b85b07f7052129dc8a1947e8b2badb4d1e6b22571b28b4d291b899245d63ff75b96d8f093ab18102e9
 EBUILD kwindowsystem-5.95.0.ebuild 866 BLAKE2B afffd0e601defa6eadab8675fe0af66a89e49b6bb722f1d1d3341489cdf350cb6f0e2279879a5f13e677a7ceb66382cf0beaf04fa80241edb1f3b8a534dc09dd SHA512 a64f18a9e94c7143fa287c3b4a913f06df210a1185ab593d6e757486a65415673adb31423115f19527733f342416440b5e859fffd248aa056697e12f9450a764
+EBUILD kwindowsystem-5.96.0.ebuild 866 BLAKE2B 752edc037daa6eb62f6804f4790d4d85cf8bf0d4ea13fec2c3fe08b1e582edbd371d49eb78f1e68e424392b89511e08a7c8babda7e4c7670e5b8c08fca919129 SHA512 c39e501ff40e7aaa808e405bb20832c80e698c2400fdd500a081a94d82c480b6cc81d8415324447d9df3f37e4ba402443158b3c6cefd4376bc914e517ed56729
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild
new file mode 100644
index 000000000000..74c35ec5626a
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+	local mycmakeargs=(
+		-DKWINDOWSYSTEM_NO_WIDGETS=ON
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 41e4097fefd6..b5e3b593d4a4 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
 DIST kxmlgui-5.92.0.tar.xz 895672 BLAKE2B dc1e6e59d367b830447049a69b8b1d41d9b5e1bacb88c7e229a37c507dd4ad17b8888dd5f5456099a30076c95b6ed8bf8f0b44a333226c939bfc755410bd02f8 SHA512 5c8d68aa59259e4048f32224ef0672984d6edbffb38476d2bbe9466b72a14aaf318cdba4a1eebb4209879e9cf880e736b9647491eca8e3ec8f4c03d50cf222e9
 DIST kxmlgui-5.95.0.tar.xz 897948 BLAKE2B 55e646a2088245652c9139ee20659e3e1d66986bc7266311484d3173d29a949a7733bc8d5528dcfcacf7eac18a8746b67eb7765571b3d92db025397825a4caf8 SHA512 6aaf99420523d9bf22e5e7427f7dba90bd3b60c9dc718293ec5fdd489d910bd72973da03cbe4a04b202710ee3eedb2a99cc21aff9f97edbec39a4f47be5e2acb
+DIST kxmlgui-5.96.0.tar.xz 899276 BLAKE2B 7aa619362c28c45c00bb725f5819443b8ecea806a468847b6259a053c48aa4fd9a3ce74094b65813e06d5fc426bbbb7b23450349298e1e552dc36c1a04e887a6 SHA512 44ffb6bfe8eaeb1fe1aad27d6794f1a536e030177547576b38021e87bd3c6ab57cd3fc1c41a70cf79cff8b8698a8d424d739875d9260115b5b6430cdad327912
 EBUILD kxmlgui-5.92.0.ebuild 1213 BLAKE2B 559149dcedd5d69d44dd72c18866e2c0285b263aafa0ae450c2e5bfe13ff77d0a8585974886e76817fdfc16de1138a9daee6d4f7cf9dfb5f7e8e467dd010056d SHA512 8d8ac4dcdf658f4e270847a130a138708033de30578d4fb66d9f72325f87fee9cce5f0002d13e432547a1338db7b83717b6ad74760de26f2d2addb526e15d1e5
 EBUILD kxmlgui-5.95.0.ebuild 1223 BLAKE2B 7662beac8c9f5f8b7757e4d319f2442952980dc2464810c174ec149090ebeff037df279bc121aa27e7cb7891a063b42db17bd79da6511174630b4005dbef1340 SHA512 d8475b4058d15115d6baa1f4a9848b32dac74a482c7c819ed561d27d22c6cdf565cf350810078bee9dcedd91f9e82ad6339bf785f13b6e6e632f780eb571df95
+EBUILD kxmlgui-5.96.0.ebuild 1223 BLAKE2B ca4b6f6bfbe90dc0b695c17e7f5dd8bb7940b7f8c77e0b4b31256019e7b26d47ee6cc15be10fc9ca557a0c8944eadf693432ab46d3123e9cec811b22148bc664 SHA512 a28a38cf81581b502d383154656977d4f7880db56c0d5662a96ad6bf8d31b346aa62dcff47d744e2b02874950daf75cd8a5359a9b4b42cae5a88888f4841789c
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild
new file mode 100644
index 000000000000..e79b8afb1563
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+LICENSE="LGPL-2+"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198, 808216
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest|ktooltiphelper_unittest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 724adefe3e35..adf21e44f379 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,7 @@
 DIST modemmanager-qt-5.92.0.tar.xz 120976 BLAKE2B 7100a59fb6b281b81b9c1c168ba3fb31e163c2e4dc86b641160af3ee994e38686e4ac5d2933b723b31e3a9230735c56500b8b2e4338fd4c7ef13d2bd27a42505 SHA512 56dc47ecb0bf04fb9f7d99d067f10b9efb65a82dd8929f0aa2d6d3c9d708cdaea810a1ba7b1a708f00cefc513c23f6fc2fd25ec004bb071bf42ad0b17edc6ddc
 DIST modemmanager-qt-5.95.0.tar.xz 121092 BLAKE2B f7ed8749dbb50ff6633f5d3cf6f264c22622db5cf0c0b2f243edf16f7200847b7de0dd70fb03fd5f25fec07ad51094ab66b7529f487ea2a119a858280020b80c SHA512 9f7e48dc3748b5dd8624178d76c36c9ff081ad5b1425f74aa12fe3df46e89878daa9ae7c1c126d886af0f29fbf6ed33f24de9e8b39438ba3dd7cb72508a53d08
+DIST modemmanager-qt-5.96.0.tar.xz 121052 BLAKE2B 1d8117ff16aa45939bc61adb5007be50e9bed77878124f14b723aae51507e906b7efbd4ce14ed9c00d881e67ffbd8fd67ee51a3ef6e0ffd3abb30c00d90edb6c SHA512 3c959b57e08342d0e8959d1f4768ba87703ac364eb0d4e2462b008567aeca6f8fe398fa13ee28585cf93a21278a22736e400e8877f5d63339ec36800599e13be
 EBUILD modemmanager-qt-5.92.0.ebuild 471 BLAKE2B 7c8de5deffe87973fdc694ebab34a44a0353ef447722b0d5cd7c97bf8add43cd7ba55cc617d00551d0db8649acf90a126ac04783ef6d288e64e1af0e6b386962 SHA512 e269f4deefc97e358783f0c885403b891aa0dd29088fa2c86bb931c7d2fe7b847b6e81f168f853bc3f79c884b6c72ffa26995a814b48fcbe2d844d1cbceb6622
 EBUILD modemmanager-qt-5.95.0.ebuild 474 BLAKE2B 473c71fdd84e5515dd7e9bbee9b73593809a5a9d2840cb4c9823d0bb9971d73c62bf609a49a626a9e2ca27b4a8e77fc35d15fc21d34eaa6adbaed713add57399 SHA512 5cb3407377f76ad449ec7454d025bd4cc21493205681eaa472d7e49915399a7f83fb84d10360f794fa44dd764a942d69acbfd2e7bd29c890cff9d6a4f500deae
+EBUILD modemmanager-qt-5.96.0.ebuild 474 BLAKE2B 97b7e943c8325b10d6374c5798ec087129ca3894d31080a0e98b41addb04ad56c2491e63818db20ae565cd1c3aeeca883a2869b38ae664ec817232b73e7b5f58 SHA512 67dbf30a41e0075037a78f6447d92a260bb4bde473ff75f95d849cee0326da85b1c33f39ca27f71858d76a9f1c28cb692bf47b70592359ec8111fd14781aaff6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild
new file mode 100644
index 000000000000..9ac4fbfeabcd
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running environment
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	net-misc/modemmanager
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 558ad751ef16..8d9bee78177d 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,7 @@
 DIST networkmanager-qt-5.92.0.tar.xz 198060 BLAKE2B 04de04321f5fa41abf3bd5b521ebd06dcf70e3abd59091c78de6a9d99a104896276f61929ff55ed2ab5ea0eabd5e50dca7a15268706a58c34f3a9189ae00d9c8 SHA512 30a59f28eb28e6877fe9db162e2c3fc32ce1bd84e3e4091b10c63906a24ba6cb56955bff980320b55e6b883f4a1ac249bb11396f633834182f20726442518372
 DIST networkmanager-qt-5.95.0.tar.xz 197624 BLAKE2B de594b97c2295086f44e4599982aa8189b858763be28270b1186ceda848a1fe7c71e0e5eb29dc047450a3a8843e600c858b31806e8811eed6fe1cf25e73f513e SHA512 d193f700b9646f8d82934bb792c8b85f728b638d96e42169d73f2c70de73f5571764ed50d767f85f75224cb63e2db93aa77f1c0f64a034a09480b5fc4b31ef62
+DIST networkmanager-qt-5.96.0.tar.xz 197644 BLAKE2B 191ea1360476fa85d663323b8482e37b2e281588a52303b4fbfd3e7943b974af971010097916a9915957b6810b031b69dbe9649a616298429082d2c2a6e35a7b SHA512 35f8080932c5a66a708c97826a8308c73ba5ae760abc72e8ef458ae971cf5d2f837fa9ad32ccbc3cc028065389d404adb04f30410bc637679bec88c9dffaf823
 EBUILD networkmanager-qt-5.92.0.ebuild 676 BLAKE2B 67ea439bb86338a7a5c7030763b29d5ba33685cf212da9324e9179f4940ce3457fef94ffdeb3c7dfc1e4bb476386ce07cf5e0b02c600a14f30396e90a928f9b2 SHA512 a957eb1fc61a3fe7b75b1a38881b675bff9d4521b2a076417844e57418d922df926ef11a2fc6ed9782b6e72808477899f92d32006dfe7a2cfa471d3baf79c271
 EBUILD networkmanager-qt-5.95.0.ebuild 686 BLAKE2B 0a83bcd9e1adab65b4b7b3cc3d86fe1aa6fd18951f3af1e3930c972720d3047be60e79a2955c2d8f9da9da268207042cbc608f40c4f9807ac2af5245c0511361 SHA512 5908d948f84706b132972536aa3beb5be3ae2431a2dbfe2ef5ccc076a87455e2db059c4b53607c40ab857ac19d0bc05ef92369c307abbf24c2d605acee70c6c6
+EBUILD networkmanager-qt-5.96.0.ebuild 686 BLAKE2B 0ecfaedb869dc524a2e619bc2eaec78db013b85db4b13f5de129e65dc207b8a3027cafe0427813463ac185eb62f3287cb278b7cc48a86250b1e7c8755b340795 SHA512 464e5f72b0cb25fbb9c54391466f2695a102eb8232a4cb89fe908095c226370c4e78dfea6e5c16bb9e3ed62f3855834ec1e4d90319a22dce54bf48af84967f9e
 MISC metadata.xml 528 BLAKE2B 8e547c097f06ce6bc78746988171989fd5f71384b62d582c6b7cb8c99e30ab06f5e139fd1892ae10dbf4ffb389d9cd42aaf83455b90f7cbdf54e14da469a9783 SHA512 ec5a831fec9baf40d8298ca6f825d2c20d2b221f83eec4f2439a5e9aab8ab07b2ed4e114bc73f37ee55a15174c94fc7f271a587de9d2e8d34bcd76ace8565d19
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild
new file mode 100644
index 000000000000..d4091bd76f67
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="NetworkManager bindings for Qt"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="teamd"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+RDEPEND="${DEPEND}
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[elogind]
+		>=net-misc/networkmanager-1.4.0-r1[systemd]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 3e2b2703bb47..6d51add68ff0 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,7 @@
 DIST oxygen-icons5-5.92.0.tar.xz 238636220 BLAKE2B ce9a843c7ac19c69504c92d3118488390a3adf1c25381d920e5ad096518c72089e1e99c08ff3dcba340a8ba9083b04505004fa3f76be53fd12a26e88f81a5395 SHA512 af336e9996abacf7f7c9f221caa4ada64d2b043a398f757fabd547ba311ed390eeecf621f1f3a7b38d67d688b8e1926a7c17de03d96cfca72158107a02d91834
 DIST oxygen-icons5-5.95.0.tar.xz 238634168 BLAKE2B df3f769732f7eb238c01c7726cf24a957ebb7c57d690cd33c3f8a3c714a87fa30775ccf17177de1e02a22401d7a3838aa4f41b35b953a4f1a330d5f1832ff6e1 SHA512 b1b8dbf7dabea5212fb7c3385a9b5fe8faa8d288b21490ee8e57091af7b75568be180799308e8584addd248cba5dfc8e7305f2887abe22edf565e864bd773077
+DIST oxygen-icons5-5.96.0.tar.xz 238635128 BLAKE2B c42043a99f4e2ba314392daf6dcce5bf58600942c410dfa4e7a14782e8677060d18cad5671fada454e3c2c07c1bd17ea0d95a44638b1ed8e363f5043890dc805 SHA512 faa76c08a232530ad1e9cf2f1f46c217f55bd5880736df564725c61cc74b4e04d484d227f67d68b13257d8ab1ba0cacb761950a5c074b35dcde4f06c50a3d90f
 EBUILD oxygen-icons-5.92.0.ebuild 693 BLAKE2B 8cc6973ffca7feb6747de4755dcb443b52edc311cbcd5afb167b81b251cdc289a6efa8c4a4620a6691dc0e0afdc0bbfaa6950a3fed550bc89de32baaa7ce754e SHA512 8067c03c06527ebff470337398655dfb8643dc932c65fb79cc837e186897939087fbc426169219b9e336dfd4887f41b43dba51842139a475d4bb87915af276f6
 EBUILD oxygen-icons-5.95.0.ebuild 703 BLAKE2B 41b6fd197cf18c98df18b7d11ef26456bd29bf4da4a13d64febd19e6d2f48d98582bd97ea476133d0b1a80e9bcee48f4bade676c290e86283a8633cf67934b60 SHA512 d3f1085883c248347b582e8b6f194c69e5aba126ef1e3b6c7ae5ee30b5856132b8bfda2e5e6d2e1f03222731fa7cebe84359c0ea5c0f5d25e4384a2ed8c23f1f
+EBUILD oxygen-icons-5.96.0.ebuild 703 BLAKE2B 2b5e891c5e7f1640227cc8a12f15d330e15d364ea0bad5bedda6408dbedc518f090411e9da46db3dcd643f9f46cfb04ccea61746b67155c006e7367ffe611360 SHA512 4bb1a3e62126c97cc5b1dc0aea56f9522d22f429f1479d51225eea53a1c9279eac4ed94cc38c8950dc2e4181f0e2173fe1e98494f91fe83f1291b0f5708098af
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild
new file mode 100644
index 000000000000..3c4daced34f0
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="oxygen-icons5"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Oxygen SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+	test? ( app-misc/fdupes )
+"
+DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory autotests
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 556cd1d36a31..d366deec2356 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -4,6 +4,8 @@ AUX plasma-5.95.0-fix-sizeForLabels-double-scaling.patch 2057 BLAKE2B d3e4ee4d02
 AUX plasma-5.95.0-revert-QT_FEATURE_foo.patch 1515 BLAKE2B bbaeef7f8c4d7110f27371a2f1417a2ad47e9b562d0250df4c917a5aec71426307aadb6d33e67ec85c6c8a3623483eff5b01bdae38ade37820b4c7861ab2d910 SHA512 87b73e53ed0b36a43fe973e96f05280692531a0d2c445bda11b712bf3987102e8f1522ef5a4026ef55f2434c1b793f5e3d1204be87afacf47d376312b6db1af0
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
 DIST plasma-framework-5.95.0.tar.xz 3139008 BLAKE2B 55d3e32402a424e9362fec0dc06c80ac0d1754faeb0f60b6f0b447e4fef996e3c8f695300440f763ba911e02efe92d1d0a34e8cd5fd4458c4d1fe31000477097 SHA512 f5b109477b437cac9a54903ee2198df8f38bde4499f1a75288cbb299ca6b0d7b02b624bd5d741bd8e62136201811167f5406d4d98ceed2c86fa23842cd7f36af
+DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
 EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
 EBUILD plasma-5.95.0-r4.ebuild 2075 BLAKE2B 6a2d65cb67c0450c5fa9311ab8482f2130e4d89a60426640596e68f80510d63b761a4e486f0a2e9267d396eb158e8cbe174c83a752dcef7fb9167b14bfb07180 SHA512 7138e8fa7e26b8bb8790d6a0f69a73064c9c16d7750a6f02e2d98d9b33ff245b31fb6ce989611ea246d40303ce872197f9d070f1da58fedd1470528e05fab34e
+EBUILD plasma-5.96.0.ebuild 1955 BLAKE2B d04524b049a1faa908a9c42a0ba66ec8faf442c6f4f9314804e99c8488a048e3c2d5b421564bc0887bd5e848588acd860e0e4bd56e217412df1105081bef1f85 SHA512 a21aba385c06113b6a8582fd94f2f8152f79c699467cbaa7009e5b2cdc4a420a4d3afab88601a10be5a68fbd7777bcdd212ac1bfa5c4b38c786ba9214f912e8e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/plasma-5.96.0.ebuild b/kde-frameworks/plasma/plasma-5.96.0.ebuild
new file mode 100644
index 000000000000..21ca1fef839d
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.96.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( media-libs/libglvnd[X?] )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/libglvnd
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index b5de6645673b..14d3635037a3 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,7 @@
 DIST prison-5.92.0.tar.xz 47936 BLAKE2B 72b919e042d471dbcd87faa081b00abdcdb9b708b4cfdeba4ba09c0d013b3b8cbf35220768b821e198b2fefc916472117e50be320268707ff1a5e44ff31074dd SHA512 18bb9f5a804cc80cf3770c1d4149ef075650357e81642a230810a08b780c35c563a3c629839bf8a0ca39d9b1ea01d24862a6cf1992dc5577fd1d853c8ab87b5f
 DIST prison-5.95.0.tar.xz 55364 BLAKE2B 1ac147e0967080ca3fa920f83da42f72edddddeea52dbbfb08f85575b48bd95573e046187c8ce505ea02d44adbecc7ad9a91b91c1222316cbbeb1aa644e2a5c3 SHA512 83369da86f9b7ddd813f7a90367943ffc4eb066260ad9999545aa77cab0f6783531d2cf2081715e3ffd70fac377cdea221b79b626127c8773bf96c249536f990
+DIST prison-5.96.0.tar.xz 55380 BLAKE2B f6fd3467283a1d7980d070f77031d72bec4d94da0da30f99e360ec6cc160c1041d0025227df41649a0c20c4c247e99269c28e146aacbe5dae293a2f13457e562 SHA512 1bb85d4e8e6cd349cae559d5a933e606896ced077b850b4cac1a50f374ac2b938d01095c83a8bdb76af31069c17dfb07102a3a9f3c62ae9832f5b3846335a078
 EBUILD prison-5.92.0.ebuild 642 BLAKE2B deb3edce82f6ae3a545505bda1530f6d6ed0d90f3816647d2f020ff8cd7cc6fd4ab4c9500f59c5cd458f7bbde2af0c6c5e0b09c3d99bd42ec25eef33187cad75 SHA512 1980afcfb4b1e46884c2600bafb046f7dc7adad522f0e11563edec60d6cf92874e98e5a992b0a0160c8a73e24de44f1165f9c10fb4a57e1217d1e0da18c3a51d
 EBUILD prison-5.95.0.ebuild 686 BLAKE2B ca129f97595bf978e7cc3752e712364e890220d8d097029874c08fc5d7fcc270232d3ef5ee6a29c30ebb177e778bb758bfdc2c2e0d57b85aa06f37477b4b7ca9 SHA512 f7692a21c38560e016e73024c6a9c26b86e4451b94ef76fea28a411ab31f83e94e33fc571934635f33bb9a2b42bf2b1808d8873cd24c9b8b783d3bee5557bf3b
+EBUILD prison-5.96.0.ebuild 686 BLAKE2B 3c287c85dcb0be76b0717ad42e5dfe3adec4d96875dac17be1071ec330e2cd3456e159296d92c5911ddc1c1dcc313c7e9ea91b2fc4ca46976d5e606f7bc72861 SHA512 a6dc424a7186aebf29752566b810b13f793f63f2ccb048fc6e78be7c0c12569a2cbe5251a51261d63b3e37d224517df07c04633292386932389075ece1659228
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/prison-5.96.0.ebuild b/kde-frameworks/prison/prison-5.96.0.ebuild
new file mode 100644
index 000000000000..0565a18b5df5
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.96.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://invent.kde.org/frameworks/prison"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	media-libs/zxing-cpp
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt5Quick)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index a6e736c4efc5..eacb4f4bac0b 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,7 @@
 DIST purpose-5.92.0.tar.xz 173280 BLAKE2B 4cbed1b8b9b8a443fdb9ecbaf6495918c1f21f641184827a5e6af4084b5b2beb5b5f4a0a8c4d8e593ac4a4222dfc702e5b2ac5330625a3d26962f986d0ff07f1 SHA512 e466b836d4628f8773247cb952621d9c33127c26ae73c27b9f8015239997b0f7241a0f556c8c683a2a580c3977f448b1e9742965d9133e2c569d42b2d6cf2009
 DIST purpose-5.95.0.tar.xz 172852 BLAKE2B d90ec7b12f683d4bb8e2c22ab72ef7582a392ce69521be8e9df8fe173cf99c0bfed7ea6abc9817e4b6ab43ed27c989fd92605d58480977ca6ce06e2b6e4c4d75 SHA512 b0ea8e506d9d8f4162ee61cd6f946620d20e9d39c3d750952aac1d328164d5d3364cf8d605a28af78833cd75c654462d62c0dcd7425d237623ddc0f19a69679f
+DIST purpose-5.96.0.tar.xz 172284 BLAKE2B 3a272ea568d862ed4c300a45dbf6c3d5eee6b9dd1a6b8bc1f9c08535375ae9bac1233514ca8b6bafc20febce4b42efd773fe8415dfd7156222cbe3302d33d7c2 SHA512 80ede3300842db1a1e2553525c47f0d8d5d8611c6fd5509b2e864f1832b468326c38f70fd1a9588260660c4aff6ac7264d8dade55a5c255a9b46cb4aff2445b7
 EBUILD purpose-5.92.0.ebuild 1588 BLAKE2B 8298d0748acb5af86abe5fc6602c27c2f4ca33917102b49408e54d4595792cecf2cee70db792222bb50bbebd274d5524bd8d83d98a135cb914b4719374fb8395 SHA512 d983ee88215d8a5a226e54fc2844732b1194a7dfde030cdcfbbc83ab25ae34638a26466485831484248d0542c51c3fd451b494810f660a6e2ece642b4c279208
 EBUILD purpose-5.95.0.ebuild 1598 BLAKE2B a6a0eac5ebdf6f060ede194d8ff9ae65299cceb11ece6966b30c8ce0d02ba2b923f351eb554473e5facd8972cc07da3ea1f5771d761d099e7d4bd0bce47f719a SHA512 3af9691e5180b4c956f3bec3ef181b57c4ea4945d49f78a3836784dd855cf3632b417e0a8c5debc85006e09b309d5cd910879962e236f175ac040f1ef2c2c08d
+EBUILD purpose-5.96.0.ebuild 1598 BLAKE2B 5a9aa0ac7f0033296f3ecac6d1c7354c0504e6bda4088a6d7a651be8eb5f5f928de2a681517695817bed3933aed93f06f2bd214d5a4752c03f7c4e78d423f3ee SHA512 601e0d17966a004e45fda8c43fb236316b283b4a35c2b0ed54ac71d857e7bfe48716c9586b343d8ef1c753e255ec9d00f8c11e322ae3621f983d67c1b13143e6
 MISC metadata.xml 552 BLAKE2B b690292da1dd33f95eee7c08e13912efa3c683278c494d666eed7b29ebfff7852986009fc93ef86cea1e0c1a2e3f477810caf8c1fbffe6160da187630a9a9197 SHA512 5552139f71158888ea3d87b07a13492f12a502314fc03d7ef9ac9ea827aa2ae650bcbec7d872e2fa1473f830cc18ce630bf459e449e5cba44a6f8aa436e49a1e
diff --git a/kde-frameworks/purpose/purpose-5.96.0.ebuild b/kde-frameworks/purpose/purpose-5.96.0.ebuild
new file mode 100644
index 000000000000..9337ada9b1c3
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.96.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="bluetooth +kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/prison-${PVCUT}*:5
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-19.04.3:5
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? ( net-libs/accounts-qml )
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index b86039153a90..89bc41f5ec4d 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,7 @@
 DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549
 DIST qqc2-desktop-style-5.95.0.tar.xz 64240 BLAKE2B 6b1cf50a6266b931f3eaf8f39b4fd0e97888e02da8952e070720a02a7ac9b0a7f6f1ba21cede5da4f7b493864d1f9cc5a8c978a12715632b9ab2f411af4080b1 SHA512 0bfe525eda2148753e85ea65d21e8139245e8d485ff3f50c79213028ab942d098cf5a238d6b3dd5964ddcf3fabf611af6863bd93714d40802b3288c4e6b6154b
+DIST qqc2-desktop-style-5.96.0.tar.xz 64896 BLAKE2B f2bc4a599feb1aa0ed7d604cc0c81c20d5f07471845d9fd8c28a112c7c6ff0bb66223975a44a2e1ee771b540e1634e6d4be8eb8aa0761db63068fb8411515ce7 SHA512 ef9342933beecfd7ddc5c934c2d0f399f3d3eb8dd1f02b5e0f397e1d377ec06487363bcd7f6d1be3679b4db971fec80904e20acb391b57b2795f6be3a73e6db9
 EBUILD qqc2-desktop-style-5.92.0.ebuild 725 BLAKE2B 519eeacecba5a7692f868ab520f9aaf407250943f0c9a7ae50b861be49f3555fe8c1ae6ab84fe779486b93d5649e040ea0a0893982f452f3195eca6f4c2d7611 SHA512 5b969c02b61b9381c6992fdb512082042c7abd6ccbef1453cda96316f73123119ccb9b6b9f118d5a2a2732a9f0af0f8ba6c3d31bdc23f0b98a476ce0e6264a35
 EBUILD qqc2-desktop-style-5.95.0.ebuild 735 BLAKE2B 6e8ea2d079bd22043d40988f9655587d272f17ee2b271ce0d8466a1b8cfc95570839e6d18c087d1da5d811072f3f9f01d59726be8478d295b51c993f1e44381d SHA512 6e911eabace93a072c55b1a6162401b8c9f5a689a01c7e4cbe49020fbe8b0fea497fb0c05d3c3403531ade9ee875c431029295b63e41e29732d3f82acf09ae19
+EBUILD qqc2-desktop-style-5.96.0.ebuild 735 BLAKE2B 9a9b38ee5bda0a72e0eb574c226ee7bd10491679ca9e9d4580a9519a58e2149e167a9395df1fcbd77ffbd48594133caf585977b392f28f9b53649668eab33c87 SHA512 5d276f64f704d58149294b1d2e5e0c2f266e9df724f029d6b73820d476dce10c2327ea5902cccaff557a337d7de52ed8a5f5d2de987146fdef5c3508429c948d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0.ebuild
new file mode 100644
index 000000000000..cc1ac3574105
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index a32f8c8899c2..582b4173e66a 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,7 @@
 DIST solid-5.92.0.tar.xz 257716 BLAKE2B 3ea7f377a38ed982535d7de6c881b2758f7ac9abdaf581e6dfdada2594435fe2851b5dbb6b5fb88f7a8c6a5126589a602efc4009a07d8e90286506fff0aa65ad SHA512 14be0e88e261dde525a227129a371c63de1a173a4dddd403fc191864ecf83468c20bad43c3ac06a751234a1dfb09d4371c574293bf1de9fb719d52730ec3643b
 DIST solid-5.95.0.tar.xz 258356 BLAKE2B 154bab82349e72aa5eb689dcc8ac2011eaf15ddb068ce95160c99d8981cfef0ad1ee2f99a1bf7b756f9161a03064ee478a889c3fe42b3ce6beca6f9724df62a1 SHA512 fdd4a4d4863099aced5a8b13c959d9d5da2e5ec55afdcb905676c63dcd9b75e7d3289ef4223fc3dcac1fffb9a004af82f01aba7d0d6a87c7d8b4c3be703ca2d0
+DIST solid-5.96.0.tar.xz 259176 BLAKE2B b466c2c8bf5421bbb4779252c5030be954e8ed5b9e950317244a046ccd878b0e41bf548ee2bede2115191ee86ba5253f7cd131643029ec76c448bd7682536655 SHA512 5a13db666f99aedcf0c893d3fbe0488390fca66605d2aabb30ca07e2d3a0a7e9832c06e3cf7574a25e78bcd6a002d04ac9b8e4de29ad6c5e2e191555896316a3
 EBUILD solid-5.92.0.ebuild 1067 BLAKE2B 40e6fbd7c7b3a6e4b9b4e10cef6b5fc384259f2c7beb348e396f13263e2e5480e9a02fb0169f9b74663d5030a15154220bfd1e7f3e896962aa9ba5a9ac7d2fdd SHA512 03bc1ade51016dbad2307884b0a7d3e4cec10da2b2b487026780316b794e2a9d54ce15093c285918906afd2fa0e821e92ca7cc7e357b7a28853ce01e22060f17
 EBUILD solid-5.95.0.ebuild 1077 BLAKE2B ea21812da90729c4c40509e5cdc9a0f535f30a977ae02d8ac3a0b7d0d67e6173f2e2a42699c9cdd391c49e20b1796671d0e983627ef94a439c0017f537136d20 SHA512 6ab48d3368999f7f0ea0a2c841545f0bd92673b78929f499be784b6f1200579ef10246856ea3e5080de5ae09c47811413c8797684e318050e2d616aed7101a6b
+EBUILD solid-5.96.0.ebuild 1077 BLAKE2B c71a12380eae49a0547847dc8e873692e2380c112bdc68c7386a2fba68def4d5b6655cb16c134648717236719309171a32b59dd79f2618a6951fdeb5e40a2914 SHA512 65b04ffdff96a3bb58ae5132f839e9c4350236a80bf29994eaee900ef2cb6fa0b5b4f62858ed6b53578cb169dab3335a7fb232a261ba46d1e0dbf6bfe04916d0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/solid-5.96.0.ebuild b/kde-frameworks/solid/solid-5.96.0.ebuild
new file mode 100644
index 000000000000..4846ef919db3
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.96.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="ios nls"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-apps/util-linux
+	sys-fs/udisks:2
+	virtual/libudev:=
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index e462920c2843..a08cbbb9f074 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,7 @@
 DIST sonnet-5.92.0.tar.xz 308336 BLAKE2B 7c75b962e3fec264a00bce96f8fd98641a8b5f4870daaf49ec77d204aaa2d977e097771e580bcc25ce3eb233d9e7b3e800ece698b9473e9acf6f3c676ff5cf33 SHA512 7e6fedd0c244daf6e1b94eba2dfa7124fc6496a89ca5ed8931c9527603d1fcaabd834207bcffc8abded1e9db53ee0a737eca2ba455de705f821a944d08e931b0
 DIST sonnet-5.95.0.tar.xz 308368 BLAKE2B e882368e510b4467b3d31e02b7f69b4ed239a2a1d955d9dbc980ce5804ae079a16c884b722d23193703225f76e42fe118eba0fc06ae38569a968887378be8190 SHA512 cbdd03307e6325a1bd08cb967b04e0f498c72eaccf179d1c39968a69f90903bc95f16e95ce3eef16789404ce84ad49194d53d18eecec3da8f8f9cf0948c2e5ac
+DIST sonnet-5.96.0.tar.xz 308092 BLAKE2B 89c568becffb3a13f7583e6e34e6e2046715f1abf906c9cda60ad8c14723b4b0c0330c25172a233067deea09f4e687d5afb8f357ffd9536adb392275697c4173 SHA512 4625328b255112fd6d727db8e91d47b9fd45ab9b19a754dc6bee0de96a1002a9e812c7de0ddfdb4c146581192f8a36e1a274903d7525b6a0541e6bcf2641f6f9
 EBUILD sonnet-5.92.0.ebuild 1048 BLAKE2B d0459acdf353df19fdcd0effc7a2cb2eec0b4e2507382e8a92537d6d0795455d192c114366223a3851fcc451ffba2f162d42c9714ee60755b713ea4571ca72da SHA512 0c0096aa5bf68a3c55deb7ad8963e937c29ae7c4d08136128487be6d27786f770e80a55d460b35c029586ef8c86651fe73343d10c6e2a81ffceb5900d136fe9f
 EBUILD sonnet-5.95.0.ebuild 1058 BLAKE2B d9ccd29cfe0db3e3a423121b9cd46a798cdb03888c5a063b979f209718825dfcd48c18fcc28e2ce28f8f344decea62a8397ebfb8c4862ea892368c90665d8804 SHA512 f069cf8b6b61a527f04dbbed0cc7be1332571368eb8440f48980cb0e8138a87f3490e658490a75220cac7ef9168f4ea6f8e325845e05854d6332570dcd830355
+EBUILD sonnet-5.96.0.ebuild 1058 BLAKE2B a6923b6f42369ab22fa3bf26ddb043578fdbd3c4de7e4f73d1d1c12ca8ac4e818bfb2e3c5a99c6185e9fd7086cac8cbe8bf47a0954e057b8c87497769a839665 SHA512 3dd8972faeb291b611a00cdcfc84924cbb397a9f9f55c40c52d4b49e3f15540eee8aeec8e12348127f52469d9e1e9501048f0e57b7401d9b37eb848d1d86995e
 MISC metadata.xml 787 BLAKE2B e63406afd42c6ac2d69065083913fce007407ea82119f10243748b73011dce25e0ef289e9e42f7573aec339be6811cb2cea2e195452a4a0911f8e195c3ea17d8 SHA512 5b70ed9a1c5475b8200cc8b59c5488525023c33ee997c81efbd362b45b35dff43b22fa6a8e9a440be2ca5f65ad1b51c2f1846f2e96e44a1ea27ba23966d76c02
diff --git a/kde-frameworks/sonnet/sonnet-5.96.0.ebuild b/kde-frameworks/sonnet/sonnet-5.96.0.ebuild
new file mode 100644
index 000000000000..1837f25326ed
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.96.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aspell +hunspell nls qml"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
+		-DSONNET_USE_QML=$(usex qml)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# sonnet-test_settings: bug 680032
+	# sonnet-test_autodetect: bug 779994
+	local myctestargs=(
+		-E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 822b641d6584..33aca09c664b 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,7 @@
 DIST syndication-5.92.0.tar.xz 510388 BLAKE2B a7272d08610ba30f2f2249d2ecafe1dbe54c232cdc5f851d6c6acf33cf60103d08b18a666b2e570b10644e9f8a205121a6bd2df6b6c024c4b7478b2208c41ad6 SHA512 4b83c4d5d3cebc362fdbf2e5041887c713c680ddf5e5294e393de96259322399c4745c1ad87ee0aeb3fa8aa17514e2f2c98e204b43f1ae8df9ba2447a64e87b9
 DIST syndication-5.95.0.tar.xz 510448 BLAKE2B 161972b1cc75e501b66db1014a278b622dca536c45b93be8eabeb32b10369f9b8c0adfc0991e71129173a629365992f5ea3eff870ff224f292d8686ec7d1364e SHA512 8b11074e6eed1d4025d4966c118cd0dbf2cc7a3400cbf10412dd16e8f0437564a1b8294ec26ab74caac6d8c3845aba2ec8743d60ca8633486f14167d6b3b684c
+DIST syndication-5.96.0.tar.xz 510504 BLAKE2B b59241247a7557a603081bd3685010a1fe724428e3b784517b67e0dfb9fd55bb852e4e4a8d9ef008d1270907a3177c7cd2be9a9481296dc41ad34de4a776aa6c SHA512 2069364750a1be9a3026b5846d37d2c0b75125d66f72c8a7efc76585445b699ac8e8fcbf24dce80fd32787041c513477bb5d7d77647d5254aadb880a2474d902
 EBUILD syndication-5.92.0.ebuild 449 BLAKE2B eb1deda6bce9eb5c344227f3ddb6a94a07658037924f0a29c3acf0c1baec19242d0c4579eb75ccf4ce081ef22385907b617df2da809d8f33b18ba1751915aaef SHA512 6946a11ad30b8923ebce8be374c3fd2c2f869600e599eb3bbd58f13fce402be644491b32d2ae010b7eb605dd864e3fbc730ad79ceb471db100472b068eb39c73
 EBUILD syndication-5.95.0.ebuild 452 BLAKE2B 315d1de6063fce44b4634e76d9281e5aa663e93926f12e488e3a93806c027bbcf7da89bb538507d72b6d9d682d11b60a59bfac87e1e5c3ff2233ae19744a04a4 SHA512 ec2eecd4d965c4d25b572696be9dcad0f7583f29e88b3eb1ade06b64d14861253093ec28412b822306c89d3c151e024a452e75e8e0a178c8182a3d0d07b78a1c
+EBUILD syndication-5.96.0.ebuild 452 BLAKE2B d1d58dc28b90faa781cb95b5b080d6a3faf9d67723b9434e48cc1f50a5e1f44551b898a41225d3253579ed91f1d851395d10bbb77b1b6187c709c5bceb666c8e SHA512 4cd71a7d6de8e35ccf1f55c0bd20b118dd4be68c6aea10bebc00a43408eb3490b626fb6607aa21189be73790aeb6e05dfffaef4df1c7b7a111f64cceaab9e325
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syndication/syndication-5.96.0.ebuild b/kde-frameworks/syndication/syndication-5.96.0.ebuild
new file mode 100644
index 000000000000..304b107b84df
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.96.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index dfb4d3968e91..84e4d246f5b2 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,6 +1,8 @@
 DIST syntax-highlighting-5.92.0-fix-bash.patch.xz 3048 BLAKE2B c342f0e01930d9a8577a2d36588deeab767e6730a721e5462af202284ba0d96837479b6e880401749390ecadb877d379c1b1ce38588198178e7e22e2f133ee0d SHA512 9bace711c744c0041fadb3bffc530ff3f8c2d0739792999e0de48b66fd4802943c77b24342489f2db26b0f92f9eafab96edb0170083eb95c7c26e62e2e44beb4
 DIST syntax-highlighting-5.92.0.tar.xz 2394744 BLAKE2B b445efecf6c5be17efac2c8247a901f3be1ce576fdb1100fe5da22aceb67ee1161c798de222f08ed611c82a35cba34b6167fd2ad3b150d91a9c46ab8fb299cc1 SHA512 bec8064f041fa6b57e57eb33eeed457ccf4e329f9b9b2ae494e000c26e54d4e966d1368b9772a638e7c8318192e701dfa06f5b3b508e13f32a8ff130582e5d96
 DIST syntax-highlighting-5.95.0.tar.xz 2398196 BLAKE2B 03f2e5084f605a6d7a62f78e08ffcc2ff5f36a17b67cf6c5ed24be27980c0cfeacc198037104814256e2386d8bae956a5fbeb426f986a88592cc834bdb1344a2 SHA512 efe392439eb93567235f2cce35c228eb45038b11b430486eb65065f7f31959d4c98d7a2eb71aec79eeb4db70d12ad3f1f0850be65e0833c89276e8e9dfe4bfe5
+DIST syntax-highlighting-5.96.0.tar.xz 2399612 BLAKE2B c9549fff056c582fb72461483ee90ff5e1f44cdeeb586a288aee5dabb3f60ebebbc64e33cf9557043fa42cf5f6afeec9c143560868517945b7d19532594fd729 SHA512 55412c64d151ad72264547822c478c9882d1e8f397b621d2d2f976df4a9703fdb99cbc1d2fe749cf87df456c0e4359e4c9a9e53f464d677ae1b28c683f2707ec
 EBUILD syntax-highlighting-5.92.0-r1.ebuild 750 BLAKE2B b7c7f6f511046e46d07fc5021179bef6cc7d80088030c685ef9f67ea201490aafddabd0ed438c0532fddca59bb442930771c42bc799939214df71fbf5ed1c918 SHA512 e2af3d591a7e59b8731f858d1fbe12b4a7bada3fa82a52563a661c8f9ed897dcd5b78bfc94c72b8365ba08878551ecd2ec80178c6f2752d112aa33d49bbdaa1e
 EBUILD syntax-highlighting-5.95.0.ebuild 619 BLAKE2B f0eb6c293cc15ed751c31486ca32329d1d50e2ac360d9b2977c408809724719cee6e761fa8c2ef94daac3a8e7b704d2b5f2df190f7ddb3c7c81bf0d269209529 SHA512 e5c446f9f7a145374368fc0b41bc73d857e644ec7856ce64bec26a392deb43da035af03f5d6bcb6548d667f94b60712d671d406f8111f6edd53270496d096330
+EBUILD syntax-highlighting-5.96.0.ebuild 619 BLAKE2B f8c6157c2b523fe9ac56d6e1b5566326c4ec69325929bbb995253b62a60ec2a50880045cef8dc56c8223bb3b5dae6dbc3a63399bf80a3fed7fd1ba8180daa851 SHA512 2633dbc61decd9748a7672b513383ce58152488df63ad75f84da0f06ddb5ef99c575f385f467204288b43545280f42dfd7cfde9c33f97417db163a635760dbcc
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild
new file mode 100644
index 000000000000..8bf8c390ecb5
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_install() {
+	ecm_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 926e99645f65..868bd95f55da 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,7 @@
 DIST threadweaver-5.92.0.tar.xz 1413000 BLAKE2B 2659e54bbdfe559f52288d71cc2f43aa41e3773c88a8b2d3ffce21def930c4dc615da89ffa0a15a77bce280bbdfc6430bb5a862dcdb25b071522afd79630d7d0 SHA512 7262e9c88e4a7eaa9d53e70f572e906d48340afcf63c057b92fea8c648755b48683a570d7745efc8f13134ad061fbdaad1c919764d96e804d60a659a5c28e340
 DIST threadweaver-5.95.0.tar.xz 1412572 BLAKE2B a4d640a13a0a63ec53297dae8443dea6ffd7b14a46c9ff380188432cbf694b1b3a586d62959d17fd3d2b9f6e641a37cd8b5ed8829ca366c74a6c61d445ee370a SHA512 d83f3850cf8cfe0fa3e49595bdca85d86f2ea83c30d465e88b84caca3cb8086c2ee66cf5aa39c5f6e0b6536d6f57fa224b807b8ace7169a7bfba51317fa9223f
+DIST threadweaver-5.96.0.tar.xz 1413012 BLAKE2B 04637969c0a6b24211c98e62e5eef38273af4058c4da621494ec028efedb4c9f1d569eb7160360618d10745aeb340c254d85bf059e6b99f54f18700cdcfd6a15 SHA512 151169abff000a32b02028e0c5a96aa926875cf63023cf34d1b0253d456361b94e30284c5c3c7460c851a5e5bb59f34d91a7c154f089cc2721e0551fe87e7bdd
 EBUILD threadweaver-5.92.0.ebuild 367 BLAKE2B c1bae25dcc03ba96f308d6f8d0c5186369b9d5b5dbaf01f34f60de67e0aef9c3dea9ef6126fe7bf0b97e4e7c3a48daef4695ca13cea8cb63b778cbc3703a064a SHA512 0f9f4351d44efc14a1bb0a646c5af2ca409ea629c745a256f41d39567ece816b9fba01e876540949eba7fe53203024d914fe460dc9489a23026ab7eb904425d5
 EBUILD threadweaver-5.95.0.ebuild 377 BLAKE2B da9de75562ba1072aaf9b2179638ceda4e6d049410868bd43b7ef8cf1b20bed9be978e065c8b45e0eb57eb3a0c574c1db8861763b2843613dd46c2c49a747c23 SHA512 860c4ab5937aeef14c54099ed86c173c2d3b5f50d45b027c1873a60d8da3388142312779381850aa4e2cbb7e2ce9828546af9ea9a430dbffcca2c6b225322033
+EBUILD threadweaver-5.96.0.ebuild 377 BLAKE2B da9de75562ba1072aaf9b2179638ceda4e6d049410868bd43b7ef8cf1b20bed9be978e065c8b45e0eb57eb3a0c574c1db8861763b2843613dd46c2c49a747c23 SHA512 860c4ab5937aeef14c54099ed86c173c2d3b5f50d45b027c1873a60d8da3388142312779381850aa4e2cbb7e2ce9828546af9ea9a430dbffcca2c6b225322033
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild
new file mode 100644
index 000000000000..f26a277daaa6
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	ecm_src_prepare
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index d43840c3f8b4..9a973ad82efe 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index a0d2a43d015b..c012fff943e3 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -10,4 +10,4 @@ EBUILD claws-mail-3.19.0-r2.ebuild 5674 BLAKE2B 2e7d16867ff97f487479672a09cebd43
 EBUILD claws-mail-4.1.0-r1.ebuild 5724 BLAKE2B 9c753fb8ef5f61659af42cbf890fcc843627974d7c00d17ec38b34358bb9141f9e5bed58a9c73c2e40a3b5cfc4ed0373b9340546cd018e07089c15d0cd84727c SHA512 df6385039e8b915a5b5947e6dea883435d90986fe7296e7ec29fd970a657a49ff991d4ea2b1ab58900880ce8406aba59e1e96bd9fc6a599f9dbea38394f4bd4f
 EBUILD claws-mail-4.1.0.ebuild 5681 BLAKE2B ec9a34804414543b8b56f0b453d3b1720bc732491021a90199b8e569d548b79c392289e3ca4bfb30e4378743d43a558dffb44330b658acb13b538e8d9ccd18a6 SHA512 770233f6291ab78ea84cad826e7e99af9206e18044c959a83043d4c03e1d611f8e1d372b4b226168a7f45fd80763af839579ab2059b89b9a42ba9925916342e6
 EBUILD claws-mail-9999.ebuild 5998 BLAKE2B 4c9c1d9e74dd51a1dc4352f08284ffbc2db37b5107a91e9dd72bf417ee3a5b053dcc17a867db41f46236b99ddd3040b07947f7f8a260b01ac1a4c98efc1620af SHA512 d88dc00c953d137a6bc94887193aac83c3be8fdec211ccf59ccc101cea918ed90a13f0219563c2d2142e3cc49b45aa750d2ffb516e3bc0004f35e4a71bbafcd2
-MISC metadata.xml 1384 BLAKE2B ba1b5173e57361a044a0218ff8d524f6849593bf28b45d7ce6595d42861d8f6ddf8ba8a603facc8bb8e3bcda630e527f7152c34f1839f13aacaa21a65aad48b8 SHA512 374e14bffc293f1652a2639f040304c62318cc36981fd9241080ee081142b2cf24315e1d229313419ce92625f15e68ee1c98b1f656cb4d2cca56e0cbd637f020
+MISC metadata.xml 1469 BLAKE2B 783f75970a9a6d0919903cc4b937f4584752e63d9d629e37e89bce5fcbe1bd309bd381d633c59ed2fb2c41786be9964a0d9fd4e7f0aeb92c41acde4fddf1583d SHA512 4015fdffd6751583cb815a9af0e1e0ec2efd052a0d448f3f24248dfc9a74fb5e98f204d4175042fd24aba900d175403b95d586efb8178c2d7fabc3c10abd1696
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 5b4590f4dde6..6d4525b18e7d 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 09210469f48f..91702f94d279 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -3,4 +3,4 @@ DIST clawsker-1.3.4.tar.xz 172024 BLAKE2B db44d823f930e9a9d5519e060dc9ab3c7ac8c4
 DIST clawsker-1.3.5.tar.xz 173700 BLAKE2B 6fd90c3b1834a3726383377db67027f5155a8a4ed4ae16ee3c48f46984098e396c832ba73788b0b1f536fa839db697d4338d5afe824de9af4ce89b45fae34f04 SHA512 e6387134be258c3475a9f77c864ae549d37a076e17fa754c01610365f5343b84d375d71430a9acb83143e1b48cf22be0b5290953ef9afc6386928deab1cdeaf0
 EBUILD clawsker-1.3.4.ebuild 694 BLAKE2B 92efab0a002da4e6702d5f52744167f316c80d1329a424317a6e4bd6bf72784c29840747b2d8d02b29469e45fab579ec909c4240a5084c263be1c1fb06bc4078 SHA512 cb396b67fdafa1d521dcfe6fa157d6e08efe98fc311f7b114541e47e91cfd64c5821a6cef5ba2decfb91452f37cb92a703d92ef51ebf815e10c45a49b2a5a2c1
 EBUILD clawsker-1.3.5.ebuild 758 BLAKE2B a94555b1fd4da19a968717f6738036cb97a3dbc244cb52b47d3da70b5f312fc91b2ccd10af505697506652a6992de33d16116350e6ec4c54e7ba12d5e94959cb SHA512 bf160291bd7966f4f4dd49e943c27de47d1c3b85ab674ae56197eadb30659fd53a35bc7e0edd5a8fa3e7a4500cc8b6c80c18169b4dfb359101554d6423699102
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 259 BLAKE2B b686159b165bb65001fec330015f34ab32825ba2b95bda35f433702b2a1b687120ce9de3a181683886cbb3ec13863099e02593f009eee89b0bb1125dae93bcbd SHA512 191845ae8df52119a9934c6fd23f5b9ce8d2c77df29c750790d3ea8b6af37355b69b5b24fdeae3bffe7f5ce4f8997e7211008dd1f36e7de0ebda3a87353c0dd6
diff --git a/mail-client/clawsker/metadata.xml b/mail-client/clawsker/metadata.xml
index 115e9d64a669..ec151f29d1be 100644
--- a/mail-client/clawsker/metadata.xml
+++ b/mail-client/clawsker/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 444c79ba0751..d8cf6f69d95a 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 6fd3e9b6ff1d..17b6a163e472 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,8 +8,10 @@ DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b0
 DIST blender-3.1.2.tar.xz 41014760 BLAKE2B 1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604 SHA512 e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
 DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B 7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f SHA512 4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
 DIST blender-3.2.0.tar.xz 41520000 BLAKE2B ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248 SHA512 2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
+DIST blender-3.2.1.tar.xz 41497540 BLAKE2B bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8 SHA512 fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
 EBUILD blender-2.93.9.ebuild 12582 BLAKE2B b51cec0e76435bf0ba2ae5f4b7a1833ca186b43edd0200f25eeceb55eeb8a4ccd7936a02ba0332da2cbdf2c3368723630221ecd40fb2e94e2074b45c9bc3ead6 SHA512 402d4770d041dba7ff7de64c8d06cfcc2308525ab7ca5bd0e361d51911af82a1e43d25171b2c69f101600628dbb41343d4585adf3dae0d847ee4384dd15f11ef
 EBUILD blender-3.1.2.ebuild 12675 BLAKE2B 66f32f101bb4776aaa3bbe3655ba95c9bb3756202c145222ed00e769ed0ec2b2079b3d0d08ec61b9d3d40cad87313263ed95c8ade3ab7f9b7dd1534c796bb261 SHA512 1a99e8b98e443e24e346bb2ca052386f9b1274be139821fb90c3a9385e9f7d48f0138186fbab7b249e01fbd3a1a7101c317b78472885588c5382cc4e3ee5109c
 EBUILD blender-3.2.0.ebuild 12672 BLAKE2B d5920d6a57f92f375ce876f8f08dbb28414780495d81fc6f7a316cd4d21af0dc698482c01274d1d25b3ab792994233f0f4c08784324c32349db72ac1c08479c4 SHA512 267a2c5b5dd147a23366671086f0ea915f1051e1336ab67b891257068404e316b4463fcd7c3e3a7c0c983510ab0b876c2696b7f92bb5f358c31a702ac665ce4c
+EBUILD blender-3.2.1.ebuild 12672 BLAKE2B d5920d6a57f92f375ce876f8f08dbb28414780495d81fc6f7a316cd4d21af0dc698482c01274d1d25b3ab792994233f0f4c08784324c32349db72ac1c08479c4 SHA512 267a2c5b5dd147a23366671086f0ea915f1051e1336ab67b891257068404e316b4463fcd7c3e3a7c0c983510ab0b876c2696b7f92bb5f358c31a702ac665ce4c
 EBUILD blender-9999.ebuild 12674 BLAKE2B a127ee0c38aa45df907330631f502c4547ec5acb1d1510aba15251f855539ab4a7508360addface1af45f9c31c2e03dd6c18a7a29dfafa111400e77daaf211e2 SHA512 9eb67fd27ae89be064e30c3f9d0e32ff683c1ee10e2fc0c753fd1d2ba753aef7a188131153d860121b754f37829ccfea9964847358a99829737893b5de6b4b46
 MISC metadata.xml 2998 BLAKE2B 46de114ec2a0f5ed454d9879e6c5c11f06c386a73f8f692635cea26fc813f1d8489bf9fbf5d45c3fd43502784e02047613420e9de8d17e0e637586194e369d8f SHA512 533fdfbe7ded02391d808b42edf26ba8218c086e279a67c168bf7c654075a9608aae46439a9a98e8d650cc429fb0f0d45d0dc584861ef13c39df4f288e93bfb1
diff --git a/media-gfx/blender/blender-3.2.1.ebuild b/media-gfx/blender/blender-3.2.1.ebuild
new file mode 100644
index 000000000000..9fcc16b94ddf
--- /dev/null
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 009aa1941656..68e906e66b80 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,4 +1,4 @@
 AUX cura-4.12.1-code-style-test.patch 406 BLAKE2B 66a94ddbb95402b2edbf2b149173f5f8ed63feaf468c3300e5d8d9cad2ca1c783d643e4e051d6994db46cc3fec853172b84f98d1c3366f995a831e7fa1b27019 SHA512 5c739fcd4c4259329f39e630d7c33e55b9a3910ec1ca778ba666e71f4087f1729c4f18b138301580f8cf8fb15b297855fe72337f2fa0b58454b8e0beecdccba3
 DIST cura-4.13.1.tar.gz 42339030 BLAKE2B e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c SHA512 6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
 EBUILD cura-4.13.1-r1.ebuild 2563 BLAKE2B b3b0813ad97979c7ed9880dbb8507d380cff78708b9da65dbc4afa2c5200d9fe42e27c050bf08eb7235a014d310c6573466e594233b4e8602519c3a33c2ddd0d SHA512 8968867decf45be98931f3053384bd5f43085bd1e0fe7c6b9cea9ddbc0a02ff025095dbe7b1b540924a7e980c76fead09b8f690d154c8e55c135773dddd86dab
-MISC metadata.xml 1083 BLAKE2B 122f6c64557092750be93668e0cbd1e4b546cc711d572c0a14dae20426d722134570f7ad7cd25d769d96a264d3839b169b7c9f44f26fb0a5786c41a32c9e1f82 SHA512 1d60e79f32515d5017c17347000760702c250817c941ef0cb307ee8293c99882a4fa7c84263a7668aabb5aa5c433122c32fdd80b1dc47c32ef574c6d5e2301a0
+MISC metadata.xml 851 BLAKE2B 4b029cda9763319d2936eb36b9b1540fd9d6f99eacbc668bed43ed4d14e1ea06dc98945009819b1ae154dbefc65735107946542a69326b00f2dd11131bc71355 SHA512 904208eb672a7f75931d290de0413b5d18d7f8a3fbcf4f29d777b532c9152b7fb9064a4fb77f40e21c71ce8ac791c3a12ec3bf6c650ff0bfbbc9f069efa2e8cb
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 6bf1b5a4e99c..8857a09726ef 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -5,18 +5,10 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index d02a1251c7d5..2a06f0fb8882 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,3 +1,3 @@
 DIST curaengine-4.13.1.tar.gz 1727935 BLAKE2B d306f990b86e6120705b36eba6f3363adc67cf8c93c66c2da506c1ee461a5a6bdd27a4e04880daeb6cebab3ecc736d9a52eec27bf17aa9f032237a4c8ee1d2a3 SHA512 224379a40e26ae0026a3849d582353e49edf99520401e1fef56c9504638c68c62cfe394dab0eb40e4a447bfe0bfa506a880512e84fd6057a839b6384087c46d0
 EBUILD curaengine-4.13.1.ebuild 2220 BLAKE2B 8827c7d543d55beb31f90606024fecc342c047c32936ceefade82379149b03013f7606dd9a0319b987babf765904682363d6125e795ba082e8478d87b13f2e2b SHA512 7998abd636444b16c46f162a7758381aa80785c8d8ff3d0759206205fb180393b733578cb0160ab562125a066298c50e5d1ff1ba8fda7b953205012caf487f24
-MISC metadata.xml 1581 BLAKE2B c9ae9c37944858a1d85bbc2f8d2eef0be6a4a53be186f7bf189eb9d89880a4e4954c03e542fd3d7b641faf5352114453fc4a6b7bfbe4e59becb90be5bcda5c6e SHA512 a90487d6d8b44aa0e944e843e4e1d0b17dc49c82f61dbd053290a2e7caa5b175cb5d7d65eb623d28cddc5e5019b25444823d5dfee8bea30a7cb1669a9f865347
+MISC metadata.xml 1349 BLAKE2B 198974447b1c09abb0e0c914b102bb7ceab5a505e73fd581dd4e226af1fcc4b50acd2f8c8784730dec215e5144d4cd3cf2ca4cfd3db63e09f480e6c70d7677b9 SHA512 d2ba85903172e5ed89fb5c963921b36085c8d141f9f62d885ebbbe68730f24bd1ca92337d4650b0752f5830961be9c493c4757220ec0bd1f9ef25e04db6af6e8
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index a88a34925d34..d887188d07af 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -5,10 +5,6 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -17,10 +13,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<longdescription>
 		The CuraEngine is a C++ console application for 3D printing GCode generation.
 		It has been made as a better and faster alternative to the old Skeinforge engine.
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index 8165f702b487..95a8476f3eee 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,5 @@
+AUX exif-0.6.22-empty-string-check.patch 1272 BLAKE2B ea6d3c4f2c3dd75ca1d9c75433a830282b252197c5b9885278823ed70dcd1ab0e319536c9f012d093da32f7af345280f7004b5b78f0e7800ede9ea4e16de46e2 SHA512 bce1a58033f7597219f2be2edbc4b8b821b1fb6f4de591d3b94010806f278d0bad20af24d7e05aff00b02057ed70ecea548f848ac8412748312eca3a6e6d6682
 DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
+EBUILD exif-0.6.22-r1.ebuild 724 BLAKE2B aac4d306ca20bab2cef5775d2fb8d617fd1f730eb2baf7fb7539d450f68aeb2eea789b329363b257a3d458e06ee20e5b3feefe5cc4918952a0bb28c16fff6b9d SHA512 7ea9bb8ec897186f2a50e1735ae3641ee5b0809d5bbace8e9134b589158291419dc26fc51ff4e731624184f62995d257356d89d71ed8fccddcffb13d1d120d3e
 EBUILD exif-0.6.22.ebuild 661 BLAKE2B 8bd9f5447a59f623dfdd84523c165a930bb574e065542e61eb1829442d294b2397228ca307b55e610d02c6055fd5df4f00fe16dc8a8f1013ef86a0f065e3a341 SHA512 5659604e4c43e7301487d4f5a0d66311cffa3d5a2b5ee205c3236b31726bef926aa7c3ef37bca4670c3910c7192e412ff76813e125748aa122f4022c6eb936ef
 MISC metadata.xml 250 BLAKE2B 8eb6eab9ea8b6b85471a0f59c7f2dedef42afde5fac2bab4db03005a5496fc934f220f62fd54180e8372065e52b15fc5637fb73932d123ae73dbcacf800594cf SHA512 9e3dfd65976e61d9d51d5affddeb0aea1778cd3ce8de7e9c51668a71c0bbf8fd459df72d958d0acb8b4f2a495343a10648df398537803d6f0bde356c2066f6d1
diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild
new file mode 100644
index 000000000000..fd7f812a2eb9
--- /dev/null
+++ b/media-gfx/exif/exif-0.6.22-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
+HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/exif"
+SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	dev-libs/popt
+	>=media-libs/libexif-${PV}
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-empty-string-check.patch
+)
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch b/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch
new file mode 100644
index 000000000000..377e905940b5
--- /dev/null
+++ b/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/783522
+
+Source: https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Thu, 25 Feb 2021 08:31:53 +0100
+Subject: [PATCH] added empty strign check, which would lead to NULL ptr
+ deref/crash in exif XML display. fixes
+ https://github.com/libexif/exif/issues/4
+
+--- a/exif/actions.c
++++ b/exif/actions.c
+@@ -661,6 +661,8 @@ escape_xml(const char *text)
+ 	char *out;
+ 	size_t len;
+ 
++	if (!strlen(text)) return "empty string";
++
+ 	for (out=escaped, len=0; *text; ++len, ++out, ++text) {
+ 		/* Make sure there's plenty of room for a quoted character */
+ 		if ((len + 8) > escaped_size) {
+
+Source: https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Thu, 25 Feb 2021 09:45:36 +0100
+Subject: [PATCH] actually return empty stringand not 'em,pty string' as
+ expected
+
+--- a/exif/actions.c
++++ b/exif/actions.c
+@@ -661,7 +661,7 @@ escape_xml(const char *text)
+ 	char *out;
+ 	size_t len;
+
+-	if (!strlen(text)) return "empty string";
++	if (!strlen(text)) return "";
+
+ 	for (out=escaped, len=0; *text; ++len, ++out, ++text) {
+ 		/* Make sure there's plenty of room for a quoted character */
+
+
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 755995b3c883..a208543a3341 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,3 +1,3 @@
 DIST fdm-materials-4.13.0.tar.gz 58458 BLAKE2B a73e4eff8e6a8104b985d8c6b73739032bad7a2ad184a96c02df85e9f16e72fa7390b96f4cbd6fd9b38db440eefa83d22b42b6a6a7fc1b4b119f1400dd1a075c SHA512 12e08d3f0a7871b95f70ad0c5fae9027923de004595c0516df34dbe91b59ed13092b984cf1e11ac6162c577f157cb17195dcca9e4aa97e5c0fc9721a640a0a21
 EBUILD fdm-materials-4.13.0.ebuild 543 BLAKE2B 3912ac76bd5892d864e313d1f465ff8897d6844468073393ef7fc47481f9e27c3857210d1d797cf8cf47a2eff8e388f00d74fbbfcce0874d5c8067d20c2eef28 SHA512 84038ba978d7553dc7e7c7e045a1bb40aa4e2f92e1a8fa8f0bb41f5411184b4dcf3ad24d65bec40437dd99c8ee34bf86132912110b914120b08f8730b182611d
-MISC metadata.xml 994 BLAKE2B 477271a4ea6891c6cdb09ff9d461487a8005004d412fb44a18f284b5dadf045ba1672c435dd8ba7c379eb1e183916fc1e7057c81deda8d937b62dc03f4585db0 SHA512 0373206da496595ad5f13617c66c620124f1c9eb9f186bb4f029d0fc2381db6345f5ef9f85607d999653be1bc3374bddb10605f55b0f7221ebb18653d46e99d9
+MISC metadata.xml 762 BLAKE2B 06df406e646433703d4037d0ad4f7087947dba3da61209371e1c1f22ef335911d4e40ae8a69528c38a06d4858b47b8df9aac48ca450b91695cf16396ef970ff1 SHA512 3ddbdf310b36b3750444eed6deea275cf38b5e0f275445a4cedc49ecc72571c4694d1ae27179b50ea96b2867951c99d31c9a908be8c4e662d5855c05862c8d9d
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
index 1e14643efba8..2d789f812974 100644
--- a/media-gfx/fdm-materials/metadata.xml
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -5,10 +5,6 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -17,10 +13,6 @@
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 6f8f82ad8dab..5bbf4593891a 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,6 +5,8 @@ AUX freecad-0.19.4-backport-correctly-find-PySide2Tools.patch 4425 BLAKE2B 74920
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
+DIST freecad-0.20.tar.gz 75452957 BLAKE2B 600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1 SHA512 b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda
 EBUILD freecad-0.19.4-r1.ebuild 10840 BLAKE2B 66755fe7c9b95e8cd3daf49b095449fe5df3e22ac0f04aa121c1b334b236a7c4d10fe79d5b14c2a37294ac121685940fba80619de765adb16af33e224c5d3af6 SHA512 79a1f85d6394125c1ebfdb4614fa1528cd414313f65728ccad87cf32f75d3d764da7691b277255b96db71de247102d25fc48acb9a58623660dd88e40c1381d60
+EBUILD freecad-0.20.ebuild 10755 BLAKE2B 4d5608c56d23486fe29f6d613f4a1a301676d5d811c80e8cf6e90bba238f63bb0b4d9e2d53354f21e8b2345c1a8bc60929df0fb82ce40c271fb3d826bbd487de SHA512 ad7cf1b3ab8bddb1b476a94ca4aac65c594c27f87a7bb7ead5c3b01c9ee62c52facdcb8db8513dd9bc8d6b37f6fafffced67153ff49c54fd8d91eb49b3975e3b
 EBUILD freecad-9999.ebuild 10687 BLAKE2B 8750d9f805c932ded40a10403889b3b3f0c54fed0f1f2609a2c32c5dbbd93da0646baea52f4afb870d997a452106a36790c0e603b32e71b6f46e29ac64fb8d2a SHA512 d8c3a3b98d69df0513710955e5667326bc9c5b7b130bf9deccdac4c9bbf9dd80dd9196a1eb0b562c8e54dcc03edc06aee295fb2312e301a04a63a700a49e3373
 MISC metadata.xml 3712 BLAKE2B 1ad9603f7dd92dbbd8bfc77cb345c907c3e19a4a6cedfa3aab64abf5b8131de33c11adbc1cee7e2351f4da3046bfe5a2964a32262bc3e28706ac2704065b3fd1 SHA512 f9a47de41d6082d7e06795398161a79e88077bacae4d8d2006a24357a48624fcbb7afe8f69eff4ca17c7cb57dad5c5a609791967bbd689069b0a5a42059606f7
diff --git a/media-gfx/freecad/freecad-0.20.ebuild b/media-gfx/freecad/freecad-0.20.ebuild
new file mode 100644
index 000000000000..d71ea49e2be3
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+# directory for USE=designer not yet packaged in tarball
+# see https://forum.freecadweb.org/viewtopic.php?f=4&t=69450
+IUSE="debug headless test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+	openscad part-design path points raytracing robot show surface
+	techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull:=
+	sci-libs/flann[openmp]
+	sci-libs/hdf5:=[fortran,zlib]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[json,vtk]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+		dev-python/shiboken2[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+	')
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+"
+BDEPEND="
+	app-text/dos2unix
+	dev-lang/swig
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspection? ( points )
+	path? ( robot )
+	ship? ( image plot )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON
+#		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_DRAWING=ON
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=ON
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=ON
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=headless as well, not needing a guard
+# 2. We don't need virtualx.eclass and it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if ! use headless; then
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
+	#		ifc++, ifcopenshell, netgen, z88 (no pkgs), calculix-ccx (::waebbl)
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature_header "Computational utilities"
+	optfeature "BLAS library" sci-libs/openblas
+	optfeature "Statistical computation with Python" dev-python/pandas
+	optfeature "Use scientific computation with Python" dev-python/scipy
+	optfeature "Use symbolic math with Python" dev-python/sympy
+	optfeature_header "Imaging, Plotting and Rendering utilities"
+	optfeature "Dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature_header "Import / Export"
+	optfeature "Interact with git repositories" dev-python/GitPython
+	optfeature "Work with COLLADA documents" dev-python/pycollada
+	optfeature "YAML importer and emitter" dev-python/pyyaml
+	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
+	optfeature "Working with projection data" sci-libs/proj
+	optfeature_header "Meshing and FEM"
+	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d02d50a71d11..008ce465c60e 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,7 +5,7 @@ DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 EBUILD gimp-2.10.28-r1.ebuild 5568 BLAKE2B aba790ec8b864d40b7f9956311e014bad49ac08e4738644a1baf93590fc844149d1dfe85c005b09599cf18bab343187945df6feda207ed19c48558c2aef0adfa SHA512 193d3db7d3db3876e2b57401ec567b9599e8af1d0e2436ec9b648f5134f62bca47e5d41dda6ae07976ed3bdf466a966510daba6a5dd22ee7412d4f01bf8c63ab
 EBUILD gimp-2.10.30.ebuild 5568 BLAKE2B 6c3e731d5b5f952f5d902aae14bc0a3691e1d4f9b715e9aa2cae3993f1b7a477c6935bbda84851a0b823f43731e8a0046a5f76c950580bd2a6cb67be1e369381 SHA512 e9f38a509ae7d88979f64fb5f06c813350927f88ad03f94539e931bab8f397c39ffdebad207012c4adb5966ee0c0a12424e836a5c0a7a06de6d8179a68600712
-EBUILD gimp-2.10.32.ebuild 5653 BLAKE2B ae20b5fb8e4c809e7ae982e7fcc2535abcc93b07886c229ee618c59cafd801cd70babcf3f37a8593094130d9bd269b764aa97dc53362ef797571d86046d0020d SHA512 89c10e137bf7a70d309804f7709d987fa2788c2077066d7ef40425802715fff305f06cd46a34457c7bb67c1c93c02d214f3d9ef637e0db5aec1e1ed4b92ef6eb
+EBUILD gimp-2.10.32.ebuild 5650 BLAKE2B 9d4658518a3c033d5e15c44b4045b720022ca54bb7ff937880644ce36d901d2e65ac1316c9b7ec4320394b41ddaed7d8dabd879a0f22a79f1039166c922d13f0 SHA512 73a23e7f604abe3efb3a76918da168566872d9e2b7b8187068e0551fab185de0e8b02fe944d7918df2a69b55282e69e3afb1dfcfbfb041834c869d6544f42ad1
 EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9
 EBUILD gimp-9999.ebuild 6672 BLAKE2B 979fb403f70b4cf2c52926e3e878503f4cd44af0ff00c3459a1f21f08396e6bf1198e2cb7bd0ff92ad4a72bab2b4ff74762c7566f74fd941ca169999e0a9a3b2 SHA512 6ba28b3d4eb3a4a116924b4f3c79b374a32ee7a990086fd6b018339e9817228edd7468dcf64dcc87d95f05ff8a0442126a94e390cdb934a50228b199ba948182
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-2.10.32.ebuild b/media-gfx/gimp/gimp-2.10.32.ebuild
index 77afe045ad17..39ebcdde317f 100644
--- a/media-gfx/gimp/gimp-2.10.32.ebuild
+++ b/media-gfx/gimp/gimp-2.10.32.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index fc7d94169a67..f59f5a0b4261 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,6 +1,6 @@
-DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
 DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d
-EBUILD mcomix-1.3.0_pre20201123.ebuild 1744 BLAKE2B be86355dc4c55efe4d87bc22291391a4dcc851eae28bd7cba024c93c4a42341234b4e8891e937cc0b323701ad23c96ec0855ceb2c07cc71d2951724b0420c2c7 SHA512 112c81eefdbc94a8c6864ed0f09a91b1e753222693cb4caad3ac93d34a5c024a748884d3b45b3bfeff8fdbd5b2ca9ec177fa0f2cbd78e2816788c9b1b94c70dc
+DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64fd32e10f4cb3f5b1a4815dee29a1a1b576798bddaeb41534ab66cb301825ddcd39b0b01252e1bbe37e0384b9 SHA512 fb908f19b98364e8a765c26fe6b2d7e0b147210b4406a421ae7f010ffdf1987520899ffe2343a26bcdb0bf6b6c9cc5f5ec866f72adb49fb16f0911dd42289a0d
 EBUILD mcomix-1.3.0_pre20211015.ebuild 1744 BLAKE2B de625b1d28b4ef329868f03fa1fad400ac81a1be9bf1a8a8ea8ca994a50446ad2804d98d0c7212855e3c7bd4f8f7d1e440ae9c9bae17e263b5028bd0d84a99aa SHA512 b457e2f35f4cb62f808a543afe970ae7c3037ec5ce023a9572916c4fe218900bcb41dd01b27aa871e49c630c52d70ddb24705fba5a1374a2dac21c32758e552d
-EBUILD mcomix-9999.ebuild 1582 BLAKE2B 93209ca60913f37a2d2484178795fb7ebe544b68a38850ad1c5d29b0cd5871cb24aafd2f4fedaaf695388afd650647b3a53bb2157539a86b05bca9aa916b30e6 SHA512 2325bf94421e427eabd661de45617055ace4ba893a03401258c3a92b98594e6e6ed65b18801daaa0324ae0edd833ac8ea791b68daaea0e6c79825834f5d160e2
-MISC metadata.xml 398 BLAKE2B 1595be3107e03d5ea0602c77d75d0d5b10c6c36307edaa979b64ce3418c674cd3905578ea098159493860ea4b3fb3c297da24b281869dedf92b7eec8f70d32c8 SHA512 4783cdb12689f0e346769eebd4da9a14e40225c30f6afed9b7058a6ac6eb3591b39990c70f2b57339582f27a71c2fa9f88390401f51cb5f7d43cc8c0d9a39205
+EBUILD mcomix-2.0.2.ebuild 1078 BLAKE2B 02fb804e596c3dbcc80fee96e2cb8d1e8087f0780a81264183a58c13e52ab109a97bd6222522d5facd56431c868d66d048bcd6dd82ac6034c8846dc7dcf88ba9 SHA512 bf39e1eb63cb0245bc0e8fa002fb4cb736b5389629aa77024c08189e9b894569d6f7b30dfca773b3cd5d3307ece3a11891e6a9dc7c578ac344f2905d8b4fdabe
+EBUILD mcomix-9999.ebuild 1063 BLAKE2B 4c372c8b3c6a7886771c486e82cbdde53bedd22d1a1522ba9281615895cba49766eca6198bfc3d12b673fc28ca98fdd6a83803e69bf74ab6a14eefcb6d38142e SHA512 23b6fa6c466e0866b63c8b75c0c32a2c2fd007ea7e530ccd08b4dead2ea72a715d7a2c1ce7dff67a7391237bfed9c7ecb4653e36733ba52eac71d99baf4554a7
+MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
deleted file mode 100644
index b110995c4fc0..000000000000
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-r1 xdg
-
-# Hash used for this version
-GIT_PV="cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"
-
-DESCRIPTION="GTK image viewer for comic book archives"
-HOMEPAGE="https://github.com/multiSnow/mcomix3"
-SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	media-libs/libjpeg-turbo:0"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/mcomix3-${GIT_PV}
-
-src_prepare() {
-	default
-
-	for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
-	do
-		msgfmt ${file} -o ${file/po/mo} || die
-		rm ${file} || die
-	done
-}
-
-src_install() {
-	python_foreach_impl python_domodule mcomix/mcomix
-	python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
-
-	for size in 16 22 24 32 48
-	do
-		doicon -s ${size} \
-			mime/icons/${size}x${size}/*png \
-			mcomix/mcomix/images/${size}x${size}/mcomix.png
-	done
-	doicon mcomix/mcomix/images/mcomix.png
-	domenu mime/mcomix.desktop
-	doman man/mcomix.1
-
-	insinto /usr/share/metainfo
-	doins mime/mcomix.appdata.xml
-
-	dodoc README.rst TODO
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Additional packages are required to open the most common comic archives:"
-	elog
-	elog "    cbr: app-arch/unrar"
-	elog "    cbz: app-arch/unzip"
-	elog
-	elog "You can also add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
-	elog "pdf support."
-	echo
-}
diff --git a/media-gfx/mcomix/mcomix-2.0.2.ebuild b/media-gfx/mcomix/mcomix-2.0.2.ebuild
new file mode 100644
index 000000000000..575e32e3e1ee
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-2.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="http://mcomix.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:0"
+BDEPEND="sys-devel/gettext"
+# Most tests are quite old and do not run
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# Uncompress man page
+	gunzip mcomix.1.gz || die
+	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "RAR (.cbr) archives" app-arch/unrar
+	optfeature "7Zip archives" app-arch/p7zip
+	optfeature "LHA/LZA archives" app-arch/lha
+	optfeature "PDF files" app-text/mupdf
+}
diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild
index 137628e7dda6..f0dfb0115b36 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit desktop git-r3 python-r1 xdg
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 git-r3 optfeature xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
-HOMEPAGE="https://github.com/multiSnow/mcomix3"
-EGIT_REPO_URI="https://github.com/multiSnow/mcomix3"
+HOMEPAGE="http://mcomix.sourceforge.net"
+EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,53 +18,27 @@ IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}]
 	media-libs/libjpeg-turbo:0"
 BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+# Most tests are quite old and do not run
+RESTRICT="test"
 
 src_prepare() {
 	default
 
-	for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
-	do
-		msgfmt ${file} -o ${file/po/mo} || die
-		rm ${file} || die
-	done
-}
-
-src_install() {
-	python_foreach_impl python_domodule mcomix/mcomix
-	python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
-
-	for size in 16 22 24 32 48
-	do
-		doicon -s ${size} \
-			mime/icons/${size}x${size}/*png \
-			mcomix/mcomix/images/${size}x${size}/mcomix.png
-	done
-	doicon mcomix/mcomix/images/mcomix.png
-	domenu mime/mcomix.desktop
-	doman man/mcomix.1
-
-	insinto /usr/share/metainfo
-	doins mime/mcomix.appdata.xml
-
-	dodoc README.rst TODO
+	# Uncompress man page
+	gunzip mcomix.1.gz || die
+	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	echo
-	elog "Additional packages are required to open the most common comic archives:"
-	elog
-	elog "    cbr: app-arch/unrar"
-	elog "    cbz: app-arch/unzip"
-	elog
-	elog "You can also add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
-	elog "pdf support."
-	echo
+
+	optfeature "RAR (.cbr) archives" app-arch/unrar
+	optfeature "7Zip archives" app-arch/p7zip
+	optfeature "LHA/LZA archives" app-arch/lha
+	optfeature "PDF files" app-text/mupdf
 }
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index d517b361220b..f62d0f2ed5e2 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
-    <remote-id type="github">multiSnow/mcomix3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 8a620ae589a5..87923cb9bb98 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,3 @@
-DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.15.ebuild 796 BLAKE2B 3ca9c7636ce5e73b43a0f0b283702baecd5c2c9679bb748154f4b9628b8a5c0da1313541b765a5c6b29c90e2b5ba83983b70baf9f7be9d4e95879f45698148d7 SHA512 fa276bfc2dfe220688168102a2e04118611014b9511b0af6a8a1d38bde81fedac7365a928db71336b9db3b0cd28bd93dce6bab4da3dd4444dc4995f3e4e0fc7c
 EBUILD potrace-1.16.ebuild 859 BLAKE2B 7b34c9346834b7aa1433187306a64a193fffd94e46522add9c9ae7be004d24f0945e4d8c348d3a1e7aa93ec912ea2e936b8c31e0e79da4abb1d66199cf781bce SHA512 1dcb9cc7b86cfc3f0e68be8d8e02edd956adcb78cdace2a534f3512d9310b64549d41cfe17c4303ec56526c7147a87ed3a0e6f56aabe53ad719038b5d2e16bf1
 MISC metadata.xml 415 BLAKE2B cceb9f3de95f70ee185a8044e965b34efc776df761be895541066c1dfeacd855330e27260c70790996caa0cac4c8ed9f662c61fb327217c58733f3dd268a2775 SHA512 4769d99d39b5f4dde3de07c14f99e8cfe7968dbceb826b111eabb39ec06de29505766657285f85233f0077e790360aac2ffd92a974f0bd02968fff2e1e22c978
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
deleted file mode 100644
index cd386d37305b..000000000000
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Transforming bitmaps into vector graphics"
-HOMEPAGE="http://potrace.sourceforge.net/"
-SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="metric static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	tc-export CC # bug 610098
-	local myeconfargs=(
-		--enable-shared
-		--enable-zlib
-		--with-libpotrace
-		$(use_enable metric a4)
-		$(use_enable metric)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index b2ab5ac6744a..eab45fdf09e2 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -5,13 +5,8 @@ AUX renderdoc-1.18-env-home.patch 832 BLAKE2B f994893dceded797646b51f7e1a54cbd91
 AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415a8c8133b232374e419e490d81864ab0d1600b84a6f15a4760530078c489c97f7e12baff331cb845cdaced2fad4b2525987876d SHA512 08c38cbadb4cce24036dd22b185a78d4bca074c0d8caa44c1567aca414bc00a60a8adf73a2430930a620b624689be31f690fee92919d9245211f1189493ea091
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
-DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d
-DIST renderdoc-1.19.tar.gz 46514201 BLAKE2B 32027b743afd75797b393194f1c0a1864985ce4a7eb419d47bd3665000b77e3460d5501b555d4206f332db9894d2697a00bae79d831d7f7724737d889a85ff64 SHA512 d3a3d0ec9e5782dea27e00f8eb26e9fbcb764e9ccfca230846fad229ce7f2db48d442365d530ebb4e1f50eb44d596a5c18f269ef635c9d5ae4b9275e676a92eb
-DIST renderdoc-1.19.tar.gz.asc 833 BLAKE2B 809e1db20625ad26f2d4b1d13e1bce67133311072ca314a1f662f2fa46b28e5ced976513f1d7b112266cfe2dbe59cec82e1cc556116b1cb5f47d31e834df8073 SHA512 4897b041dbf697d3255986eb58d5142ead52afeff1761185d13fdfbbb0caee077bb7d485a0527a4d921e141ad8eaf414d9d2db38bdd157937620bb15da2320ec
 DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e
 DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
-EBUILD renderdoc-1.18-r2.ebuild 5060 BLAKE2B ae86523a747f334c2167f82dd79edbd379b324f2575126243d1f5d282a8f147eb8a8c58413ce066965bf697bf6b1abf19607ca643cd45227dd4b16d4e5dce803 SHA512 747b1ca95cdeb3f7c93b3a3e488ba964fcf215d1bad15c36cf94442f00697dbca527fc5b31936f8d0432b213f1985490e7e650d7e84e88658e96f5950bcd5f73
-EBUILD renderdoc-1.19.ebuild 5229 BLAKE2B a5eaadd2acc80c490ec955007b06e45f51ddfca2036b2b6c513a0ea29e950ade975aadb42194cb7a414f91be6683dae6a2c345bc34b36b47a00170d8d95779cb SHA512 cdb9a12d97390bd67a2d17723a6fffe9d5706bcebf1069ae02c4cb81f308c6eebffeaf8f3715ccdedac4fb3b9fba5e6678a5afd0b475f65a795f73906e53d06f
 EBUILD renderdoc-1.20.ebuild 5229 BLAKE2B a5eaadd2acc80c490ec955007b06e45f51ddfca2036b2b6c513a0ea29e950ade975aadb42194cb7a414f91be6683dae6a2c345bc34b36b47a00170d8d95779cb SHA512 cdb9a12d97390bd67a2d17723a6fffe9d5706bcebf1069ae02c4cb81f308c6eebffeaf8f3715ccdedac4fb3b9fba5e6678a5afd0b475f65a795f73906e53d06f
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild b/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild
deleted file mode 100644
index d76b6eb4fa6c..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs qmake-utils xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-
-	# Check physical device API version and supported extensions.  Fixes
-	# segfault on some GPU/driver combinations.  Will be in release 1.19
-	"${FILESDIR}"/${PN}-1.18-check-api-ver.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.19.ebuild b/media-gfx/renderdoc/renderdoc-1.19.ebuild
deleted file mode 100644
index 1503f8651e20..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.19.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 7dfa6fcd5a00..7f6f35e56f84 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,5 @@
 DIST ristretto-0.12.2.tar.bz2 612128 BLAKE2B d845da75f5139ca73702b2ea2154026ecadacc72587d81a22564d0c0ae84e605303a368ee42a9c915c3d00a0b8471f6a6e1a6c6c2f7d7626f766602a29022ee0 SHA512 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379
+DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
 EBUILD ristretto-0.12.2.ebuild 891 BLAKE2B 0a1ad5b7e052921e9f49504488e42ed4db81d275d1186df39c8717fc92cd57d3bcb875dd15a952d231f0d9b03fa70d7153c6b6a339d1c433ff01046167862b53 SHA512 7148b68f84c0a9c9c07605cc3763b13940eaaa56e703445ef179e2280fb340afec7343884987779e40a4c4f42ce4b38a50cc6d520d24e1f2408784000050eeb2
+EBUILD ristretto-0.12.3.ebuild 901 BLAKE2B afef4ea16caefcfa6bcf4a7ee7d90e248a83b01e2b38334ba1a162282cec3eade650fc3bba183cef732b5173461ff3d092629d24b9d7b3b838ab8504468c521c SHA512 539bf9d2e0428f5652163653be67b39496e6c9e0312939640214b13d45709ddd6bb42699f638eeb8e39e910c90db33cb1b032c9dd66f7610195aef2c5772cdc0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.3.ebuild b/media-gfx/ristretto/ristretto-0.12.3.ebuild
new file mode 100644
index 000000000000..70f85279a0a5
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.12.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	media-libs/libexif:0=
+	sys-apps/file
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
+	>=xfce-base/xfconf-4.12.1:0=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7edf282bfb85..83edb73c72cb 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index af4575c6c6e0..e2ed308ff268 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,10 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
 DIST alsa-lib-1.2.7.1.tar.bz2 1084711 BLAKE2B b7be12a51453a82d0eb2e57fb8f9391c8778e8c63b78b6e6f46437bca39e3efb13394ba0e060547781ccde75fcdc19da532d5aed24fe0d5cfb885c1604e4e8ce SHA512 2a0b4205e8bf602b56a6f5007ba219799e5443827393058e439adf5b391bb6c4815a48bb994b5d108b9f31a90db0eb43a96a0d7741216e2d710dc63d372de27e
+DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe
 DIST alsa-lib-1.2.7.tar.bz2 1084924 BLAKE2B a3bfbbfcf31625be0749218b3c02b307da9077d4bd82e9f980b8e3d6f9275f3a3f3c8158bb28fb1c61724a35e794eb3f6cc8872202ff42fb847725058109087e SHA512 6bd48b07d659fddad792876326a93b2a549ce94bc191131670365599c31f81f737bfd8e94dec6fe296bc5d86df2e3e381bbb7a694d24fe7e8e501f1c994ed084
 EBUILD alsa-lib-1.2.6.1.ebuild 2313 BLAKE2B 02d78d02d665db5d31f937be8983f86ba45d28f1b8f9961edd7b97fc83c2186929836ca7c217b9989c651e9dee75e0e37d3daa462fe099ee9a8a6685bc1cc6a3 SHA512 af89550a294ef1932045604cf81c9f37a40f94acd731a55d654391d96eb5bd7c026716ba72303af64621cf0a98c2bdd92abd22881e4a776845e5e235778d4762
 EBUILD alsa-lib-1.2.7.1.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
+EBUILD alsa-lib-1.2.7.2.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
 EBUILD alsa-lib-1.2.7.ebuild 2307 BLAKE2B eb062334ed34d1d40a32fec1cbd63fde78c17b5e71752dd15f53a9e562457c685894f6676e60fa2c1f566bf6015dae9195f56d735b00d13015d8bdb6a16968de SHA512 e0adc0f5412c292871e46a216afcd28050f77aa32b13093709087d560b6ee80be3362775c4151ed06ce923ba39e0f4d21e017c8606cf6c408c3e3022cf455f05
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
new file mode 100644
index 000000000000..2fb3f286446d
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+	# Please set correct commit ID for a snapshot release!!!
+	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# bug #545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Broken upstream. Could in theory work with -flto-partitions=none
+	# but it's a hack to workaround the real problem and not strictly safe.
+	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+	filter-flags -flto=* -flto
+
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 56a54b76b38d..a8eb7ca61b2b 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,7 +1,9 @@
 DIST alsa-ucm-conf-1.2.6.3.tar.bz2 28153 BLAKE2B c14e50f2bcf95fbc038d3b2b5801850d4d22ab041fdb57dd9f4b161a748326671687585279801a9d3f803abd3d253d86b6b3e891e8c3024c5641f8a24ccccbb7 SHA512 14031173dd9b44c506f13172fcf89d1119e4b2d409a749ec8ef4948e75231a5e5091206e826dff9e70f1f803de8cfb9fd94886ef70764c705f65c1c7ebdf649f
 DIST alsa-ucm-conf-1.2.7.1.tar.bz2 32566 BLAKE2B 72a58b3eb927549ca1433d1249cb43723dd26bf6ce2e72713859c81d2b56388c99d03e028f0e27952dad6296e7efe7e94744cb37150b56b9985d99cee8d53388 SHA512 e2ade1b4f4d26cfb77fb423b82b7eea1b51bbb4857b771acb845da3f3f99c846ec28a415eb184c7d79ffbe1edf21f026951778f905e23658d78deaebb1315759
+DIST alsa-ucm-conf-1.2.7.2.tar.bz2 33011 BLAKE2B af8ce94b5eebb84e2420e96f9052e9ed1055f3c37aca088add6f98d562bba67b856ac5ec16adb3f1893fd612eeadd9d342b83ea615b213ce7d9ac010a0f5d4cb SHA512 b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db
 DIST alsa-ucm-conf-1.2.7.tar.bz2 31282 BLAKE2B e214e0957493a977d7016180a8b1ea26f91f568944e2b9fc65779d63f3f4317016d183c35bd07b7efc818bd875d904c4b308de240b60275d6b025b66ac134e73 SHA512 3f69343213632ca4196d83f2713302ff9839d9c5fcdf9e0c0be4d358a854844085f9c18acad01dfdf492eda203e2bd5d40939b09074e9c0b57692732bb3136ae
 EBUILD alsa-ucm-conf-1.2.6.3.ebuild 517 BLAKE2B 41ab7ee7c44597bdc2ccf4d3d213deb759cc17d5d5fc0802c582dacd5c26a1ed44b3005e805b74fb5473144e82a28726e982d47268a159b42d07cdcd6ad55cd1 SHA512 82a04a52b13ded3d16f122a24c57526626139f40793704b7dadd6187029b3884f3b517e9d50c333752d18d25192a5a196d0013dad1b22aa426103c0a2671c0fe
 EBUILD alsa-ucm-conf-1.2.7.1.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
+EBUILD alsa-ucm-conf-1.2.7.2.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
 EBUILD alsa-ucm-conf-1.2.7.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
new file mode 100644
index 000000000000..69d00e46df60
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index b1056e2a42bc..25f313bc5420 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,6 +3,6 @@ DIST babl-0.1.90.tar.xz 309324 BLAKE2B 9fbbbe06539fd85007875e697529aa071d32a2d9e
 DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
 EBUILD babl-0.1.88.ebuild 1761 BLAKE2B 5a2bdf88fb83178a3e64ac744d2c8c87d2ef1d7496c7cb35fab80de297be56b60445e282f0cce2188000517f1f63b6b118c8d9ea7f1cf4fa7e32a50c5118cb22 SHA512 96aac9e6aef6489543f7cc1d287efd7e2e98f8ee3139cc96c354c13f976693ae8e53db1716f4cc13db6e183f257c53e57c097293b93d0ddcb5074650bf9d0360
 EBUILD babl-0.1.90-r1.ebuild 1833 BLAKE2B ab7a5aaf9597c4b151387754df092f03039ecfcc2f81e17666a8a1af473e9ae40cbe3d526fd8c5a3ae756ddc1da420f3a8930a08def9cc7e3b447e7c768e1310 SHA512 1f907db70d1ce4693125169f8e5fd33215d85ed80c1ba0cd8db8f0610b6e10891f959b91b7f1364a3daccd2501a20df0a863e559164c9b92f5add8cf1feee4c5
-EBUILD babl-0.1.92.ebuild 1833 BLAKE2B ab7a5aaf9597c4b151387754df092f03039ecfcc2f81e17666a8a1af473e9ae40cbe3d526fd8c5a3ae756ddc1da420f3a8930a08def9cc7e3b447e7c768e1310 SHA512 1f907db70d1ce4693125169f8e5fd33215d85ed80c1ba0cd8db8f0610b6e10891f959b91b7f1364a3daccd2501a20df0a863e559164c9b92f5add8cf1feee4c5
+EBUILD babl-0.1.92.ebuild 1830 BLAKE2B e3d24fe097ce0f9b9568bc6b3eafa94fa05ca4c42c1e141bc2f7fa0cc0359f1749c53551d6baddd76052380ebad2e0de89359033e958faad49e4f456bb861826 SHA512 ef3db65f625c9d1a24cfada1ea274f68ed194967ac2ef157f1bcda084efc8c3cb665eb51529ba288135fefd25b39cfae5b9c0ea9774ad53357566fba9142c2af
 EBUILD babl-9999.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.92.ebuild b/media-libs/babl/babl-0.1.92.ebuild
index bd0399f8e4cf..d57f8880f2dc 100644
--- a/media-libs/babl/babl-0.1.92.ebuild
+++ b/media-libs/babl/babl-0.1.92.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index d33dc1029300..050bf631baa2 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,6 @@
 AUX codec2-1.0.3-fix-build-with-Os.patch 937 BLAKE2B c0f0ca07e4dffdf6adf93507c296a729c5fad2572e7672c080e51944dd0faa48701486b741f8be760ee35aa6a5beb5f83bb98b598cfa1e895cb01d1320eea92f SHA512 dbb5ceb346a4ef5f9d7eedab6d5c58f4f83124c194cbca9413dde202eeda41d68cf583efa8229538c548f9a6a966fe03798dc6dac4ef8d23a1aeb58c49554471
 DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
+DIST codec2-1.0.4.tar.gz 14787297 BLAKE2B 21d7ec1d88cd27846e853c4c812efaf354bbd229a42635b4de8cb248880e37ef083660131083d011cb98d4ad37ef5597fea93ccc2499e760ac671345e892c760 SHA512 af279528876f7fdbca853ce4840683e07ca2124a5fd2aada4f4484501eac64f06fb1e8ba0bb1d588f9460968a029ea7c3d71c969e7ac2b7024916efd2dacc207
 EBUILD codec2-1.0.3.ebuild 1076 BLAKE2B fe3df169eb9d6ed3810294d98ac94a453f66cb7357d731d3ed7af8d2f5bfe3210f5c06199abba2e369c35c34c9985232de05cc6fb504ed54bc912bda187b420d SHA512 7a42bc69ce7f708e8112031895f6d541dadd68a8bddd33ebdfe996e26d9b2a3b9f4cc1756223dd5777e97e87d01f014519fda335e33aee3d3e85d56480034725
+EBUILD codec2-1.0.4.ebuild 948 BLAKE2B 1708b5852251c3d73ac3bf0d6815ce11ad99fe640c07c8f1af26dbe79366d1ba0d717c7ac891350f1419dd75500fc56938b6b8526f7f48297937c08044d3d42f SHA512 deefb8b227dd9ba7bef20501f1fd408652cef203f75461bcd1f6b9f71f2792874f9c003c3de7b1ccf211220de2f1f5d3449bcc36d80667abd082571fa34809d9
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.4.ebuild b/media-libs/codec2/codec2-1.0.4.ebuild
new file mode 100644
index 000000000000..fdd5f6ec18cf
--- /dev/null
+++ b/media-libs/codec2/codec2-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples test"
+
+# Not yet passing, but infrastructure added to run
+# Needs Octave dependencies like "signal"?
+# https://github.com/drowe67/codec2/commit/9a129f1b3ad12ecbf3df7f4460f496ee11e49c08#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R155
+RESTRICT="test"
+
+#BDEPEND="test? ( sci-mathematics/octave )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=$(usex test)
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 2bc9c29fa239..be165981ae64 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,6 @@
 DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
 DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
 EBUILD gegl-0.4.34.ebuild 4769 BLAKE2B b604793b8f69d8a4633f74364d8ebd841ea604ceca71abdf74f13ec7290662bb4e8486f2b1d729b0afbe6ee8d8d35fdf083069f5add4e0521f063fb1e6f51b3d SHA512 27fe527925ceb33137244ad4bdcc7ce62e46b72abb022706876bd45ab6ebe3b9b29283e27a84e076758539e5937be3430a25fe7dc86b89f014ce013a3e2a60d4
-EBUILD gegl-0.4.36-r1.ebuild 4592 BLAKE2B 0ed8be4945cae0fddb346428a2a40fc919161399cf2afd04fc15cf7119f657ee03dc0effea6b0403b99de754216260c842a657a6c38f8f4e3e84bc8091331f5f SHA512 39196850da1fe93f7404cb645ac186bed91ea99e25bf33e11c5b819f4bf0d1aa6c92c645b199332371a6f168ee95f06047e2795a364e7c3573968564f34f46b3
+EBUILD gegl-0.4.36-r1.ebuild 4589 BLAKE2B 76f5545fe85d8d77bf60b786b5c29ede05d77c9ce1f58819a1e7f1c264ad99d91c96e7db558d0e8b6b21f946b2fa85db1fadfc744a3d84789d494ab7f65c2c1d SHA512 2d3434ab4115625d17048456bc1e00371e52f70c47a07735c126a34a33bec27070c17e8621135abb53cef90ed946e6e69115c2ccfee706114fd54bbfa856129b
 EBUILD gegl-9999.ebuild 4378 BLAKE2B 84ff73cd6821e16038c52a87daaa404d7b4c09b701c0251bd2744bdd57a546f90f636efce4e6dd838c99131e251bd6c710fbb0190449bb51e412c3a357df7416 SHA512 5aa398283404313498eb5638f0a0c9c31b0f8db59acde5d5fb244558cb8148510463217c850196d972e9eb8a5148401ed03604580dbaf3e0248ccaeb743921dd
 MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
diff --git a/media-libs/gegl/gegl-0.4.36-r1.ebuild b/media-libs/gegl/gegl-0.4.36-r1.ebuild
index 6a4a84a8223b..fe22d2a5c5da 100644
--- a/media-libs/gegl/gegl-0.4.36-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.36-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 67a7606976fc..c8a641d60db8 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -3,7 +3,9 @@ AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.1.3.tar.gz 813386 BLAKE2B 6946423e3a58bea36ac6ca7619f68a30997910e0041b60e3b6a34ad3d76308cf0af69c46abc4008d19a5cee88e8f423503560598d2006645771f2eb2b224201c SHA512 cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437
 DIST intel-gmmlib-22.1.4.tar.gz 818133 BLAKE2B c1faae09ad38369b12c8dc9d9ac0d0d652f1eb0876e78cedceddaf94afe27114be905512fb3a71f7eb0ebb77544eb7601e96e19359500eb9149fd6e2e2295c1f SHA512 cd31611a53474c2d457f9ce1ce903a184b320d398dc2eba1600f5586108cfa156cde584501ce283d51a8cb13d1917789370d194b6ee3b6a2b5d823d1323b0ef2
+DIST intel-gmmlib-22.1.5.tar.gz 818259 BLAKE2B 54f8065784f9ee5ca79f4ad7c0a83a83a476a5d2db5b37194eee5234d7b30a0df4b42b2a3279e7ef4884f28d3ed8d27fe1133bc9ab8600050938c67808467432 SHA512 1786d397d3a3d5303faec68a6eecb3426391c906ec16b47bd16462732e911928b3a9e7df2a84b384cf4c1b9dcb293953dcd11ee32a2fb631570db260b15f9c3b
 EBUILD gmmlib-22.1.3.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
 EBUILD gmmlib-22.1.4.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
+EBUILD gmmlib-22.1.5.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B 18b5a947cb3620a85cd17bc24d01570888855aee49c8b2acabd88fe36cb363aeb80d15c8d127f1636c1738e2c8e0a4863c56fa9c81696171e3c2ba71f87c7bcf SHA512 7ebdfaaad8f6a1ebdc2c2042ae5f53ef7f12797fab0b2cc6a7d1075d837a8c1d42f01e2c13ba730bfb8a81f56977f827d0c00fa5fdab06f459edb663ca922a5c
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-22.1.5.ebuild b/media-libs/gmmlib/gmmlib-22.1.5.ebuild
new file mode 100644
index 000000000000..598b7721fb10
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.1"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index bdc7661489e3..97351633782d 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,3 +1,5 @@
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
+DIST libdmtx-0.7.7.tar.gz 791517 BLAKE2B 5ff0ba22dd753b644cc7d84a2ee9c98f48047d05b322993458d4a35e704ac9d330d3112db8f3461fd9945c1d09422059d47417b46b8000d3e65f31430efc8e45 SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc
 EBUILD libdmtx-0.7.5.ebuild 636 BLAKE2B 5c016cee6ae44354c10138d2555eac4be1f1283515c2ec21fa753ecb6a7fc802b9dcac133c5a10b785af1055a22786902ad7fe8b40673a0201d085dae41a4cfc SHA512 6347f88703bf4bd669bfef3ff14d30f60d371f9498eb5df0e3d8040dae07cb9f0c18b08834146e84c0e74ab4fd7f8581a49b41b7d6b009594eaa5195c804e7ad
+EBUILD libdmtx-0.7.7.ebuild 592 BLAKE2B 0d139e67fd4204b5bed2f31490e519e4b4874954e78aba9892123dd90e468a6fd93641e08f3e0923c320f2499a966f4ede2bb0a3a5b665a92f5885172890c3e7 SHA512 0955518d5d97c0cc99fbed5f5011a0c5d3bcac3d0d8588abb5e9a68667398e313f79734864ddea544c1ca633260c81f48b9fa56997c7227e5091a3d507d0e039
 MISC metadata.xml 379 BLAKE2B 7a0385fd25a2a4063b4daeee8e67299eaef34bc20c23e639bec3db9f2db760bd4fbec23778c1673e9355a2c053f7a4ddf5170735147efd3038ed6da21fc05ff5 SHA512 384fd330b22976134122440b2fd617f34a8d9508abe72c261e2821fee2db8d2ef65d967875b70dc9fac1bbd72e832166ac808348894c6b4fa60c41ac3badd1e1
diff --git a/media-libs/libdmtx/libdmtx-0.7.7.ebuild b/media-libs/libdmtx/libdmtx-0.7.7.ebuild
new file mode 100644
index 000000000000..1f83c814eec8
--- /dev/null
+++ b/media-libs/libdmtx/libdmtx-0.7.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Barcode data matrix reading and writing library"
+HOMEPAGE="http://libdmtx.sourceforge.net/"
+SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() {
+	#bug 663346
+	sed -i -e "s/-ansi//" test/*/Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 7fdeb98114fe..babc1b794244 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,3 @@
-DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
-EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
 EBUILD libdvbpsi-1.3.3.ebuild 941 BLAKE2B 468320e504c4ced70dc6c45aaba4f579dbfe9fcae9cded64979413efdbd676987106597be5f15a2a97bfa7fac63c78f7d8812ed59ed6f91caf168b4452d53903 SHA512 b65957df3b32eb11e20f951a5c9126727d09bc4576a332681be2126f08b9b9499191b8916dd730198c8aef54b1ff9716af19d9a3600966498ba3e39e1c4d3e5a
 MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
deleted file mode 100644
index f9e41b1f8950..000000000000
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation"
-HOMEPAGE="https://www.videolan.org/libdvbpsi"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# Sublot == libdvbpsi.so major
-SLOT="0/10"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		>=media-gfx/graphviz-2.26
-	)"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -e '/CFLAGS/s:-O2::' -e '/CFLAGS/s:-O6::' -e '/CFLAGS/s:-Werror::' -i configure || die
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-release
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/doxygen/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 4a4bddd7afb0..264c1700fb04 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,7 +2,9 @@ DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 743cd87f92bc89182de716254f89136e690
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c SHA512 6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
 DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7 SHA512 8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
+DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0 SHA512 6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982
 EBUILD oidn-1.3.0-r1.ebuild 925 BLAKE2B f38e5ba0887cdb823e36b7cff5a092a93c12c38bcb8aa5acd44686a7c6b102115f0c4794b4826ceff06fbf05bf3ce4d9ae58273b9cd4e896f380a63b33af93d4 SHA512 8eefc86b47ea486447cbcdb7012b51966594e59a0c00690610d3a9c21263f3b41275c0137877b840dac4187b8fe2ccef0c343bef1b9a1559865e78fc1f6d0df7
 EBUILD oidn-1.4.1-r1.ebuild 804 BLAKE2B 74e3f828c6d08b74b584cf54bddf1687b271d852ab64e746841eb83cd38c20fff165e2c977d024f4a453061c3b3bb8994b86fd1101cbca1faa1b6b2c85000ad1 SHA512 3845870de35356b4b0e6210ed0f114b483f8cf64300927399ab9516f4a636d2513fe8a5f3e9b0040df0a3342e8887733cf554f008dc6ab352b5aa1dfb68e855a
 EBUILD oidn-1.4.2.ebuild 709 BLAKE2B cad25864d215b415e28c08ae04d03135b107f031654ab35fe0bbab00c394d5b3075d9aff4aa14f76324888a42203cc29e70599f96c16a8f5830ceae8808e64e0 SHA512 b4f43f3d9f8583a720076de280ec1cb4485cd0678941e83fee13a9f1eaeb54d6b94e44efa88ea549984a52f11b56d813ff06472ef7a1d81164cdae270d848740
+EBUILD oidn-1.4.3.ebuild 710 BLAKE2B 49ae7d7917d7fb5bcd72b3c50475bf5646f28318444d07bb1e624c3ea67d33e1cbceedd33268cd9cff2882e0db8db23b38b6ee57ba805610027bd283f313b38e SHA512 733ba7ea093be8331c1cb0b7616543937083e10a5511649f61dd6cc5ea607c4690cd99ebac5570ad004f2c66d1be2230c953924602845726131f61fb0cfd4340
 MISC metadata.xml 754 BLAKE2B b1be901e2f498cb917222e495a89f5515c2837a83e086e5a7c8db5f571ce50401d3ca82546e61ab3507de3d3068eee4ee8c85b3430565eb3db7c3cfc3194f827 SHA512 1806e677d62ae2b3cc2857eb05d106abf840a1e1fc21d1a875716441ffe3db1a13c5d96ca9316b2285c43fda4e2d62829ceb4b32ad13ecea2a521a1b1ed84096
diff --git a/media-libs/oidn/oidn-1.4.3.ebuild b/media-libs/oidn/oidn-1.4.3.ebuild
new file mode 100644
index 000000000000..ac7878513748
--- /dev/null
+++ b/media-libs/oidn/oidn-1.4.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="https://www.openimagedenoise.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-cpp/tbb:=
+	dev-lang/ispc"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 6d258574a2cb..a81987c5c540 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -2,6 +2,6 @@ AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89b
 AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16
 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
 DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
-EBUILD osl-1.11.17.0-r4.ebuild 2761 BLAKE2B a8cb219690f439bb93af1d8f88e7fc6c66762d07c0ab01022df7c68150c6bbcd4ce7beeedcc6ea158946c6f20e4afd45378cd2a62aa25a9be754f604b23f894a SHA512 9b34d2a55c0151ff812966e91e300f52c41be8cc22922640eb240d8c4a3fddde4221660134bcfd3f4177f1b3d5acf0a232b7f9b7d432beaba32fc9d839219246
+EBUILD osl-1.11.17.0-r4.ebuild 2916 BLAKE2B aa9d9c6a5990f1b1f98dd3f29c929aa3133298e7ce621eb00742049d5737a1bedf22a83332fddfefcdfa2782c412bcb9b6b4abd375bf3fbbd16fb91aa8238011 SHA512 65e0dd27eff41bf877dd9df9c69b300bbef55abbf1145c5e01a30819bb4ed4af717bb704c13f588773621ae3442d258db45014b2fb0ee4108dd52390af28a9de
 EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.11.17.0-r4.ebuild b/media-libs/osl/osl-1.11.17.0-r4.ebuild
index 0a1926fb5a2d..49498f248837 100644
--- a/media-libs/osl/osl-1.11.17.0-r4.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r4.ebuild
@@ -31,7 +31,10 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 
+# libfmt dep can actually be removed once it builds w/ 9.0.0, it uses
+# headers via openimageio, but it's code in osl which breaks
 RDEPEND="
+	<dev-libs/libfmt-9.0.0
 	dev-libs/boost:=
 	dev-libs/pugixml
 	>=media-libs/openexr-3:0=
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 702c3e7832f4..6a9cbb033a19 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
index 8514f397d178..3cc5c50860a0 100644
--- a/media-plugins/x42-plugins/Manifest
+++ b/media-plugins/x42-plugins/Manifest
@@ -1,6 +1,4 @@
-DIST x42-plugins-20220327.tar.xz 3582880 BLAKE2B b6de7f499e2889cbd4ddcc57a92468cce254b8ade277c173b62dd5a7a2fa84f72987325ea5889989c46a3cbb36050341ded2dbf83f7196eec8a2aa5929448a6e SHA512 a60d2eda1ed9a56338d1b08dc5352e26d0e4c8cba225c7759318c1d6c186664f64ac32b01e190094b4626626b329f81f688a0e4b6584f6c756daf805e6d419da
 DIST x42-plugins-20220605.tar.xz 3587472 BLAKE2B 2df2f539e32ba9a5fb08495ff7f94c4555a3be6163681bf081e15e3a5a74592e981ec43d491980c5721756d77776ffcafbd5bc58f5ce7c19b055ceb4bda8247c SHA512 69b0d351b9137b4cf9374a36c7a8d0a1ae22eb39bd2b15640db96bc9036bafa59823e61ea6bfda09351dbc575fe4c189bb70c6676614ceddd9356c30811bc903
-EBUILD x42-plugins-20220327.ebuild 989 BLAKE2B 64c52e23d7fd76f44de6e6876709c383b39cdb76d2e1d6fe167c1a31d37956059f579a948ada905d542e4f83b107be99c7df105d95b48ece960ffe8a14aa74c3 SHA512 14bd1a6ff5cf67d033a95bcda843dee0b0939985b3c1a47907ae0b7396e3de90edb4af6662afcff81158dc0826ee496a8f66f6981689e19b02e75844a7517c3d
-EBUILD x42-plugins-20220605.ebuild 990 BLAKE2B 7b2a33cfbf7cd6f7851ea53cc02b2a9f3e28be408d3971b191ba754f8f715117e249ad9cb54a9fab7e5f13425322cc5b2519389aa71890ff8c646e6a96ee8723 SHA512 58440fc8423fc6a29f1a133e0e4d70e7a2ad67b14fb963b5055481db5a954e296f66cc34049f846d25a8ae65f432dc706ae6bede61f51cdac59696b146a1c36a
+EBUILD x42-plugins-20220605.ebuild 989 BLAKE2B 64c52e23d7fd76f44de6e6876709c383b39cdb76d2e1d6fe167c1a31d37956059f579a948ada905d542e4f83b107be99c7df105d95b48ece960ffe8a14aa74c3 SHA512 14bd1a6ff5cf67d033a95bcda843dee0b0939985b3c1a47907ae0b7396e3de90edb4af6662afcff81158dc0826ee496a8f66f6981689e19b02e75844a7517c3d
 EBUILD x42-plugins-99999999.ebuild 990 BLAKE2B 7b2a33cfbf7cd6f7851ea53cc02b2a9f3e28be408d3971b191ba754f8f715117e249ad9cb54a9fab7e5f13425322cc5b2519389aa71890ff8c646e6a96ee8723 SHA512 58440fc8423fc6a29f1a133e0e4d70e7a2ad67b14fb963b5055481db5a954e296f66cc34049f846d25a8ae65f432dc706ae6bede61f51cdac59696b146a1c36a
 MISC metadata.xml 340 BLAKE2B 18bfc086ea4e852a5b9c0e85c989fa02a89daaf114648d6f88569086d745823c92831548cb82089cf20092c0966bf7ec995c0918c0ce5a63701fb29078f2877c SHA512 3cbfc4312dc8f03c34aba0ae513fe8042b64cb570c0f408496d67bc7bb21688fa7939259bb67a7aaa1e1c1a3847a6f8d4bce5690d9aa025c27e15e74c24b8229
diff --git a/media-plugins/x42-plugins/x42-plugins-20220327.ebuild b/media-plugins/x42-plugins/x42-plugins-20220327.ebuild
deleted file mode 100644
index f57cf56abcb2..000000000000
--- a/media-plugins/x42-plugins/x42-plugins-20220327.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Collection of LV2 plugins"
-HOMEPAGE="https://github.com/x42/x42-plugins"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
-else
-	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="mirror"
-
-RDEPEND="dev-libs/glib
-	media-fonts/dejavu
-	media-libs/ftgl
-	media-libs/glu
-	media-libs/liblo
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libltc
-	media-libs/lv2
-	media-libs/zita-convolver
-	sci-libs/fftw:3.0
-	virtual/jack
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP="#" FONTFILE="/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
-}
diff --git a/media-plugins/x42-plugins/x42-plugins-20220605.ebuild b/media-plugins/x42-plugins/x42-plugins-20220605.ebuild
index 2ee199d0ef8f..f57cf56abcb2 100644
--- a/media-plugins/x42-plugins/x42-plugins-20220605.ebuild
+++ b/media-plugins/x42-plugins/x42-plugins-20220605.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
 else
 	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9e15af73f3e4..6b2a927c6a1a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 65a3da84955c..31011d17157f 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,6 +2,6 @@ DIST abcMIDI-2022.05.20.zip 611325 BLAKE2B 1fd9c786ec0a7b3558f71502ceda261419b68
 DIST abcMIDI-2022.06.07.zip 611323 BLAKE2B 3b0a9a1bbf0265c8c2848aff267acf3fa0b98a6fe24b5878e70db5da3e892c8658ff236511a5524cf5dcf5217bf09ccb762102539cdd12a7d23c6573bd0ed14d SHA512 1e4daf647238e28b3c4c644dfcfbffdacd0e5b9e007a3a9cb8393ba879690c74d5ea2970254d5d3f19a68c5742de80bf5aa387a7f9aa241abec2e952f1bdc0c8
 DIST abcMIDI-2022.06.14.zip 612729 BLAKE2B f9644ea59bb43d50a39f60f31f440e9d4e425701c71877fb812adeaa0757da37d2aabab5c2b3593f38a5a135adc0925545337860452317e558cbfb037c95d4af SHA512 4e8a9a770925e166dabdbf459227b26373c33ed0ec356d093d8f4de457cc9034cd9237d445f31883e7c3974c3fd4b69a6f6fb156b26e03483bcd70793e7457ec
 EBUILD abcmidi-2022.05.20.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.06.07.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.06.07.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.06.14.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.06.07.ebuild b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.06.07.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index cd3f2cc9f0c5..695589ba6d27 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,4 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r2.ebuild 2019 BLAKE2B e3f5efd733fab5ee7d6078e176f506912b868f3a9d10675a3c003056e4ccee92381816536ef3e456f5bd11c701bbd467eaff91cc5925ce799b7a04b8efeeca8f SHA512 c6b2869f0366f409674cda5a68d59b4d112f3845522a60896131ad85fa9a2db3e7d0409009c92837be8d6edc1464b67842096bfb837d711766c7684d86257c79
+EBUILD alsaplayer-0.99.81-r3.ebuild 1859 BLAKE2B e48439e1b06b72f6022e2db06c504ea0a671b9aebb4d555a272eaa904b61ca76e8c8ac38c15d72ad023e2c30c19c6501bd29cc9615a0c8f882fd0ff2dede03a3 SHA512 bedfe341424bcda1eb6673331886b94dea3cd3df086d9865af02b772025f245c8ac2813fa84ef58e1aa4a033411b110238fe7985551c53d8fef180b22afc765e
+EBUILD files/alsaplayer-0.99.81-autotools.ebuild 943 BLAKE2B 0f51ca345e6ccadd25f28ae1961af3ea70055297ad020aa232b9604ffb80c68de79ce42b231a3f8e3bf66ba0c92cd9759b604eab3aae09c9e7b61ab96b0da047 SHA512 a0c55913e8f52578f441229ed3cab999416732b45dc5019965fc32635cb5b9f7fb603ef23eacc5b22da9d423d751a12a448f1f9293e929a303673d28a33d0ae5
 MISC metadata.xml 338 BLAKE2B 10b361f79fc3faabd4f58308beb752d40d950e963b754519fb78503c0b7bb36492473b4c5ead9624e6e82d1c47d658237eab69a38dce4647cffd73c8738e21cd SHA512 af01ff0b9d7267d8a730ad734d51c6339dfa81eb4d0a2b41eb85d5f52a8fb10db872f1ea2df4b6450b0a89020884470daa28bfd1288aaeff6671c88b7972626e
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
similarity index 79%
rename from media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
rename to media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
index 098fdbbe3336..70ee1adcfa99 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools desktop xdg
 
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+REQUIRED_USE="|| ( alsa jack nas oss )"
 
 RDEPEND="
 	media-libs/libsndfile:=
@@ -31,27 +32,17 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )
 	xosd? ( x11-libs/xosd )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
 	oss? ( virtual/os-headers )"
-REQUIRED_USE="|| ( alsa jack nas oss )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
-		output/jack/Makefile.am || die
-
-	sed -i \
-		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
-		configure.ac || die
-
-	sed -i \
-		-e "s:/usr/lib:/usr/$(get_libdir):" \
-		configure.ac config.rpath || die
-
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
 	eautoreconf
 }
 
@@ -83,5 +74,5 @@ src_install() {
 
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
new file mode 100644
index 000000000000..b51277317e0f
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,11 +82,6 @@
+ dnl PKGCONFIG preparations
+ dnl ======================
+ 
+-if test -z $PKG_CONFIG_PATH; then
+-	PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-export PKG_CONFIG_PATH
+ 
+ 
+ dnl ===============
+@@ -639,10 +634,10 @@
+ 
+ AC_MSG_CHECKING(for gcc optimization flags)
+ old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"
++CFLAGS="$CFLAGS -Wall"
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
++[ EXTRA_OPT_CFLAGS="$CFLAGS -Wall"],[ EXTRA_OPT_CFLAGS=""])
+ CFLAGS=$old_cflags
+ AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+ 
+--- a/output/jack/Makefile.am
++++ b/output/jack/Makefile.am
+@@ -24,7 +24,6 @@
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS)
+ 
+-AM_CFLAGS = $(AM_CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/output
+ 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 0c1cd5ab4fbb..ae6d2a096ea9 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,11 @@ DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d
 DIST mpd-0.23.5.tar.xz 770700 BLAKE2B 91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65 SHA512 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
 DIST mpd-0.23.6.tar.xz 770812 BLAKE2B 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb SHA512 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
 DIST mpd-0.23.7.tar.xz 771992 BLAKE2B 2c75196c37eb8d075cca2881bb7ed10e434a071d3c64bb7cdb3bb96dfea74c30de2dce5bfdbc51da945df325d9f278cdf8dd03b7ba07c0ad51cea50971f4a143 SHA512 2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6
+DIST mpd-0.23.8.tar.xz 773280 BLAKE2B fd2dd32bc935cb78d9204bccea6ed52f5131ae4645efca91323db930373a5fa14115a767daa11d670aaf46e218c52578d155b9a463ed5aae007e1f55d0208d3a SHA512 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 EBUILD mpd-0.22.11.ebuild 8432 BLAKE2B 8f392818d046de9043ab4687b974e04bef7bd862250eeb9f54781b4379f399685a1c5e494e45737df426de23865b4b7ceda01cef76c3b9a2bf4938ed426b04f6 SHA512 9804fbcd13f02f6476f926502c926b008cbe9d765dabb17a15516cc7ec7d0cb1412274227c8c19564dfe47e6a2f2f397ea3a94b0bab3d812bb19ffd1ef421d11
 EBUILD mpd-0.22.3-r1.ebuild 8126 BLAKE2B 818d798cd6bc84639490e60456023bad57ba0b5e08533b903744e03fff1627811dde55f3b67f7600af10e00b17c6b490acf7fa3a616e3574001ffc5494f95aae SHA512 30f4ce07449598a93429ca88307fd5e9ee9471ce742f350ee0521ea68a6a9b4c7144c2c6ee8c93116a797dd36170189ef907d9cae77cc46b77a58df6be79ad1c
 EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b2d44e7c7e176a5f8a17126b1dea267b34ada121e39286fd8b90875750e7e75f9129d20a10562a84d331fb0 SHA512 76f547fee10a657ece1d41cbe9b0f4479525973ef616f6b1a5848096322326bd99d47d7f70c55bf48cbc83608c84f18ec60ab296c535a3ea870a2ad04625cb83
 EBUILD mpd-0.23.6-r1.ebuild 7845 BLAKE2B 3d90c4be809d911408d5a2733748d13718518816a9e163997a8b9b70bae4ae43c9f08bf1a4848813250f3c17d6e46b39bb86f61fc367491d7d1aeefe67ebffd4 SHA512 f2fdc13933b6d61b900bd107e81bdeaab17f415b80743684dbb38c912600d04b599665d391f67dcfb890d2b30a7031606a48b54d1dfcab170649eba175f4aefc
 EBUILD mpd-0.23.7.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
+EBUILD mpd-0.23.8.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
 MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/mpd-0.23.8.ebuild b/media-sound/mpd/mpd-0.23.8.ebuild
new file mode 100644
index 000000000000..a0d2135688ff
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.8.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.68:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	 sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		$(meson_feature ipv6)
+		$(meson_feature cdio iso9660)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mms)
+		$(meson_feature nfs)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+	)
+
+	emesonargs+=(
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_use fifo)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_use recorder)
+		$(meson_use snapcast)
+		$(meson_feature sndio)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature audiofile)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature qobuz)
+		$(meson_feature soundcloud)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+
+}
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index 03d2f9ce9502..2e1ab002713f 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,3 @@
 DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
-EBUILD paprefs-1.2-r1.ebuild 874 BLAKE2B d80a61d6419d41dcfe98f0591a63b09047034b24eab1a7df7bb579be96b1bab48849c1e8eab368897f78714c1ea1053529633c5ea053190ba9aa338cc53b9a34 SHA512 0dfc8d53ab9c16bf8c0252ff74b5200e587c98fb0f1093bdd1c70a442d57d35c7365cf1d0b4dbf35ef457dc389d2cbdc80b67496213ec3a579b90c0c8d0ba002
+EBUILD paprefs-1.2-r2.ebuild 874 BLAKE2B a7738ac5d04fc5eb1961e6fe5b5d541ac008648a505caa0b90e26b42600dd53ad61c5ff92c7dacb6c12354690c07506ff9a24e6a21d045bedd7694471dea88d1 SHA512 e926c19af56a88997ad3f1967d00698962da55f7231a9190f77e34d70b72c3d567cb884a084e6f05d0e4d1ff7eb3579245b1f8b43f68ecde89ffade3997ba1ed
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/paprefs/paprefs-1.2-r1.ebuild b/media-sound/paprefs/paprefs-1.2-r2.ebuild
similarity index 97%
rename from media-sound/paprefs/paprefs-1.2-r1.ebuild
rename to media-sound/paprefs/paprefs-1.2-r2.ebuild
index 299081971142..10b075e5e054 100644
--- a/media-sound/paprefs/paprefs-1.2-r1.ebuild
+++ b/media-sound/paprefs/paprefs-1.2-r2.ebuild
@@ -31,7 +31,8 @@ BDEPEND="
 
 src_configure() {
 	append-cxxflags -std=c++11 #568590
-	local mymesonargs=(
+
+	local emesonargs=(
 		-Dlynx=false
 	)
 	meson_src_configure
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 4a7b1b9b4cc1..a2408163ba07 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,3 +1,3 @@
 DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
-EBUILD pasystray-0.8.0-r1.ebuild 823 BLAKE2B 0022d224711b071c37d87d97804ca8ff37bed9b68aa237d3e5fa70933ce4f594195f17b9317cec38649e7990079e7486b34174c280a4afd6995951c1ed8fd7ce SHA512 d76c55fe739ffd67ec3dd398e6fd316ddd8433bb2ead0df628dd6203acbb72d9b953a15229d44d942d55e0129b39a1c5b514f50ceb91d977d3c4ac077bf400fb
+EBUILD pasystray-0.8.0-r1.ebuild 830 BLAKE2B ec8cd17c60d790ecf16e28934c375d40d626ffb4b3bdf3bfa9fc5debdd136efb0b5d0afbeee29e2584066ec80126b95b118ff456995da7c9f449e644a5fb486e SHA512 f9ced3dbb4e8c0991f8696f90eb04bbf883957aaca2d68660af0a9274795aca6b0a9d70b3dd0fa5873dfdd82a68cfdb3b0679228495e6d7a7e6089721b648817
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
index a58c48834bef..a91da3725210 100644
--- a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
+++ b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index fb1d8c70a18f..32973684b248 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -10,8 +10,8 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
-EBUILD pulseaudio-daemon-16.0-r1.ebuild 11998 BLAKE2B eae74c6cef4adc800de9d0f444c93ab95ad0c6943b5be4f18b46e530c8df0c33353442df9101a4ba51cc139262e03a0783d26b13cb6b94b8385f92dfd5e0d939 SHA512 a5d155ccaeb75414954dcabc4e539035dd188144c46d1e0818bd8014d505aeaaf4d4798a243eaf722372c305f4c1933420f43e138049e8175885ae304fa7d8f1
-EBUILD pulseaudio-daemon-16.0-r4.ebuild 11991 BLAKE2B a0cad25d3b04a7b7059c1c27b3b10e0917548643ca5fa3ef74e59b9c5cd75c48f66a5213b3ea608184ac35e2fa6deefb5de51bf6568ccbb257b43572975103d5 SHA512 1c1df7772101c0ec87496292f143239523400b2bf84cbdbdb464ca2c9fc340656dfed124725510274c87fa742d5d862001746bf666fa519782dd1d3f04f9996b
-EBUILD pulseaudio-daemon-16.0-r5.ebuild 12412 BLAKE2B e5f67f67e9c58a8c67f967f03ea842c244c7346edc056e57cec4ab603330741f7f824118127fa19aa5b911a2edb4eff138809e41829c4b468ba368f5b1a60807 SHA512 02d3977e39b6d66e68d42d9129c21434c98aea0ce8ef337dc886d900e494d77e0a70f855ea2832f42188163eabb6975b9a7469cb44a860a08eb08f5ffe0a7a15
-EBUILD pulseaudio-daemon-16.1.ebuild 12184 BLAKE2B 278622322edd8045b40fc6f70a9ed02f47dfcfd8d625b735fdb8b3d21022795a291b84675071b9065003247b9f6cae83c6e5984570d5d9ac812d2865cda3e15b SHA512 08ef82a7cda21f13984056ff5e3407c924627d9c5409edc9febf754b6afcf0526259a3000af9442cb8e9762e23f79277007a194ea968f787dc41acf9f1e7452e
+EBUILD pulseaudio-daemon-16.0-r1.ebuild 11997 BLAKE2B 7af693e228ee587a7ffa5120bbd788ebf9b779e7fdc9550b04b6706e200a9bf036834fd7eb7ee461b1a62a2f9ca4ac56abdab78dd3b61d78a609629fcac05e8e SHA512 fb36604ef31b93b4077bd809e4edb2697e511eecd62bb029ffb67bf2f2ed8e14fef6f61cc6356a7d5e816586efdf0d4eac121896808610952c92fd43beac9e5f
+EBUILD pulseaudio-daemon-16.0-r4.ebuild 11990 BLAKE2B 96115d8d74d47d52246a81fd965e22ef10d505f1d9276168c193269e27b7b8af53b152a8f3b7bf26ab21c053aaf0d8007568cfc7b48afc24a8c064a1524c7c91 SHA512 a6b10c7fdce24b4857be63dc00b377357927581f01ee7b5a5186036970e3ccaafa6d856f954582c42e9e56d136c6326f43268ebd772b5e5c22c23ab7bc9d9bba
+EBUILD pulseaudio-daemon-16.0-r5.ebuild 12411 BLAKE2B 1e8ed59be58201cc876f735827e32ab24141a6c0b2a677bd6c641a125ad9539138fc0b65f47b67928a281e80c0ff90a7b1a766aedadd85a033a34d18eba56db5 SHA512 2cc8cb215a11982feccec978c84d754ae7ad4f3e40e7febc5efacc4660d0e7d58a53c8b8bc4f77efb40223321c2219127fd17a52b5396efde81683dd2660f679
+EBUILD pulseaudio-daemon-16.1.ebuild 12183 BLAKE2B 98ff39cf55af5dc670be1530d9f27ddb44e8d6851dfe504fd3a628501ef6c6bc9f3130a91f46ad19687b61dcb7cb48e0cbd3ded124e2a1b3f115aed9ea73383b SHA512 cff2c145c2f316ca299b94a95e99636620a9fbf14bd6c1e8e00722721259af1f26ebff3b0c1064fc450cbe894e2cbc7fc27b17d47c027964d3aab536f09fdce2
 MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
index b6489354786a..1dc4c81cf6e6 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
index 3ec78e0ac672..8c47aaf30579 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
index f9980628eb08..66f340cd76f7 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
index 52f26408de4d..01be6bb43748 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ce78f287b380..34afdeb5ab63 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,4 +13,5 @@ EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b49
 EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
 EBUILD pulseaudio-15.0-r3.ebuild 11216 BLAKE2B b6b81a19e36106b2faff1607539af5c11a612c1a9f686f2d76b1d3a22873fddec171821ffedb3224dab2e1737fe87019460869f9059f800627a0b842ac1792ed SHA512 eadd4841cda27faa7c86b31e3cb2d658e01096ce2c4bfe1e818387294d11de3f1199c54512166df0f3dda5470f2cf7b9e37e4fcdcfe69bc29c9fe5cceaab3817
 EBUILD pulseaudio-16.0.ebuild 879 BLAKE2B bf99843aea835578905b86529c2bc11d93b28b6457d5ed6b52157e90a98ad5d9be17208c52f9e9d7dfa290e4676fcc79279aa38afa59c51d694579d4f15ec8ee SHA512 644aa3f63973836971e5793451f2e1ea4d81ce46b82c36ec61fcbe3807c5920a3c6ee8684c87f9164a9806bfc1d719b091bf1674b6955c2b3d3d2ca7367203d6
+EBUILD pulseaudio-16.1.ebuild 885 BLAKE2B ffba2709e0ebc9e12e929bcd3911b9a964dc3fbaa03b213d471033c2d50f01c201ee40f71100d3b80a1089996e9fb72acab5a3649e3ef3111c3cf2590a16eae3 SHA512 65a551a4af36c376ac9610953fa5a17a83245a0150eae1948f3d5dc1e8013402da64c02c7a6134d29ca9b050567686aa33f5193f87223dd0f1294b4dc57e9488
 MISC metadata.xml 4111 BLAKE2B c2f5d0e123d9fee8d8d5e6a3f15cc4edb94c2ab8f6e0f4e0b8e0de778c67dc5482b4cfba550fec8653412b8dd026b66e0c2334d78144028d84d7ccd8a9e77cd1 SHA512 d3c949697b0be0cf3d0447b9691a77e97f2d77e099e0662a345e5c22f965a0d0a2dfd073dd601f28f39f4fb5676c0561c816335fa8ac8a019b55699637dac78c
diff --git a/media-sound/pulseaudio/pulseaudio-16.1.ebuild b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
new file mode 100644
index 000000000000..a4098093c08f
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A meta package for PulseAudio (networked sound server)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+# NOTE: bluetooth and ofono-headset are passed through to
+# pulseaudio-daemon dependency to make sure users who have bluetooth enabled
+# just for pulseaudio package will also get these enabled via metapackage.
+IUSE="bluetooth daemon +glib jack ofono-headset"
+
+RDEPEND="
+	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,ofono-headset?] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 7c73c36355dc..8b0f13c169d7 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.26.tar.gz 1868666 BLAKE2B 3e0febf185ad5818bec00c3b66cfdcf8e2ff89909f3934facf3e371283b840847111b3eb175bcc7f5e0a073f06b01554aa5f61a0add1c21588124858849a3cfa SHA512 ca1a1cfcd7083bae83d26b0710cb7b884658176c060858f5f9fbc40a885a498731a544390be2a61f4f986d113ca112271eaf5c6218f6e3051b152dcae836b8d0
+DIST qtractor-0.9.27.tar.gz 1995105 BLAKE2B 08b3a18d37eb700960e24741178079deb728f909f80fc00491abbe832c1d1966022ec6bd2c24469047b53b168a7e084a7d76da96e587afff78662f2f1c9b1d26 SHA512 2bcd4c5676fda58c7cf9ad9a9dcc139eda11c69b1c608812ff912ff63da56fbd0ba6b76828b326038365c9d84519bc752c54572e8edbf573e6cd0d068a17faf6
 EBUILD qtractor-0.9.26.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
+EBUILD qtractor-0.9.27.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.27.ebuild b/media-sound/qtractor/qtractor-0.9.27.ebuild
new file mode 100644
index 000000000000..f9f6cb16552b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.27.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=0
+		-DCONFIG_VST=0
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index ed273f4713a7..457279c349b9 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,3 +1,5 @@
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
+DIST wavpack-5.5.0.tar.xz 797996 BLAKE2B e2a00052ce887c4ac4e767a1852f0b94c7d23071f5974cb15f33700acaf5b6ae9e5e08a7dee8c66520d2178a4f9e3cc2139da78f040803d55d504b949000c8c9 SHA512 9758e8079618e45e585330cd472f8ddae6e0ffd9a79032e7ec60251fff331390a619855dcdcf92942f5192d6ae12e05b6feca36394d30f0fe7e65222ee2696fc
 EBUILD wavpack-5.4.0.ebuild 846 BLAKE2B 94ced432ab59947059e929f939a2a2ff4d7d06221dbbeb5ba5c6c6c5c2d01864d43647f3bf716c30b179518f4fb01d2cee74283791a2dcf7475e558180ce13a6 SHA512 4b0bdeadd930ba09dcfb105a1fb74fddee021038c980fab742525af8d2e5b22260e88d06a1d69558611b51f46935a64c0171ce28483e6f8c9bf17965129eed82
+EBUILD wavpack-5.5.0.ebuild 685 BLAKE2B 1523feaf34e4a7b151eb0b7d4be201215ef212ae74544481179a7c63cf141ff30413f8cf7f12cb3fe2ada5b5ef80676a72226443427cfe40c8e368a0b9bae919 SHA512 65d30e1af060c86cba16dee17256a3dd12b5fc03132a1a9e0f6795c29f553b18eed67dfb93c752f8de7095d037f1048086c6affbeda86612b2842ed7b61fc981
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/wavpack/wavpack-5.5.0.ebuild b/media-sound/wavpack/wavpack-5.5.0.ebuild
new file mode 100644
index 000000000000..3c0b3153eff3
--- /dev/null
+++ b/media-sound/wavpack/wavpack-5.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Hybrid lossless audio compression tools"
+HOMEPAGE="https://www.wavpack.com/"
+SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=">=virtual/libiconv-0-r1"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(multilib_native_enable apps)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8a4b203de96b..a6d9f25c9876 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 7584afd93300..e43640a0c29d 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,6 +1,5 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
-DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
 DIST devedeng-4.17.0.tar.bz2 1773455 BLAKE2B 46d91145f94122bb3a9e83368f50dde6f1b25cecf5101c7d79bbc237bad69cb3d80d3b78429be76af2e4652eeb09e99e12c6c014c6bac8e71a7dd01d689ba634 SHA512 942e9a969146ae87bf1f1a5fa7441459801258f7dcac5a2f2ac8def146c6d88d8d3db27c474b7741cdc980c0757f99e6ee03b0da524f71895ebdbe2fe442a179
-EBUILD devedeng-4.16.0-r2.ebuild 1230 BLAKE2B ac929c4ce44913f0d3d7bc032958750298b3c25fb605109afd40c299df2d78f506cde5a0f16604e216feecf9406e71059245b886e5305fb5ddba5e43993267e6 SHA512 5388ab3467c6292e4bed71bf3ece06bab7c8944e3aa788b1bf76c197cf850053bf588f4fa4de1d586c4f195519523f527cac4ec196b0813e8429ab3c60269db3
+EBUILD devedeng-4.17.0-r1.ebuild 1232 BLAKE2B 96a7b78c586a6e25200a8ffd814cae2173ad3add2c37a9cf7a5f808cf58168fbc8e3b72d584ad098e9606ec62701f6f96238f4abf4ceb536cdc8a3e6f19ada3d SHA512 f3e1af855b7a1737d899bd5e8cfc20db59a17a4e9750ae2d8989cdf9147ac18e899dffd8e7f1601d77edcb46b7220d9845eaf5a190455dfa3b1d91aba5a9bedf
 EBUILD devedeng-4.17.0.ebuild 1230 BLAKE2B ac929c4ce44913f0d3d7bc032958750298b3c25fb605109afd40c299df2d78f506cde5a0f16604e216feecf9406e71059245b886e5305fb5ddba5e43993267e6 SHA512 5388ab3467c6292e4bed71bf3ece06bab7c8944e3aa788b1bf76c197cf850053bf588f4fa4de1d586c4f195519523f527cac4ec196b0813e8429ab3c60269db3
 MISC metadata.xml 944 BLAKE2B 1dd92770403fc8ea2d4b6032341a0b7591d4f01e067c4d3196895da9c5a294db79961a5451673e03f4cfa6f647a8d35f74e95cb3255a52f3b95771195e826196 SHA512 140cc1c7ef35dfac691fffafec4f72d5badd0eaf074ec95aa7924401ce76fd511f4fd0309606d9d420e5a277b9210680ec83c783d736fc28a702bd2b557a8f2f
diff --git a/media-video/devedeng/devedeng-4.16.0-r2.ebuild b/media-video/devedeng/devedeng-4.17.0-r1.ebuild
similarity index 87%
rename from media-video/devedeng/devedeng-4.16.0-r2.ebuild
rename to media-video/devedeng/devedeng-4.17.0-r1.ebuild
index af4294ad0c8f..8f72c85f9c0e 100644
--- a/media-video/devedeng/devedeng-4.16.0-r2.ebuild
+++ b/media-video/devedeng/devedeng-4.17.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 xdg
 
@@ -38,9 +38,9 @@ src_prepare() {
 	default
 
 	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \
+	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${PF}#" \
 		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die
+	sed -e "/'doc'/s/devedeng/${PF}/" -i setup.py || die
 
 	# Desktop icon
 	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 1bee02eac7a4..b796e4c2378a 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -14,6 +14,6 @@ EBUILD mkvtoolnix-60.0.0.ebuild 2713 BLAKE2B 8b6c460647fad06911cf9f6f4cbbd1e0122
 EBUILD mkvtoolnix-61.0.0.ebuild 2733 BLAKE2B 4b3262642f5bf64e60ee3e5537f65881ec6287113f1ba7d160c118454f425a87dc257ee73dbb9d0a7b96f72551c6ae8d337b9d8120f5ec86519122375b9370c5 SHA512 fdddc73a07386bd68d0b85894f384e88405f09285b78210a31fdb2b2a1d1341d04b9329f94872480482a24aa60ad8c261df4c2e6b5d82b570526f0b263df168c
 EBUILD mkvtoolnix-64.0.0.ebuild 2743 BLAKE2B 128120db4c38bea554f5a19ceecee021cd9dac3e5b3771a901dbcc2180dad5ead753f53a373323a8b86d6ca18023f441253325174ae9cbd7b014cccb933734e4 SHA512 91fa7c061c2be25ab775156a163c552690d5f91ce797988e9f24689a0ccfc2a612dd1f7eb0dc2b4706cb16060f8f1d2e15c8db36d9ae298fbd94e00f51ff7afd
 EBUILD mkvtoolnix-67.0.0.ebuild 2953 BLAKE2B 3c3c1b2ca1234d7bec20a30ad859673be073655a8182021d4b1ae20e2132da41a949d5f9a8203cd466f0fe1008aa0a3778fff243328c9ed1119e84c9a916bbb6 SHA512 c3d1772e7363c6ca4c9760e6a40c87141d3da03e24fddb98255204b1320dbf104525082738a2a3c653acdf857ac6f868b5e6527e199748e9e86f75f68eae2845
-EBUILD mkvtoolnix-68.0.0-r2.ebuild 2979 BLAKE2B 0d2a58ea11c46ca03203d1be04fe5b6e7dd70dea6b8800ba54720804d0bda14e15c88438e700be55663f7a6f1f863320bfa855c30d733a25ff735fc7123996a3 SHA512 5e953d9aa9e45890239dc673ffcbb8d88ae68565ae095ae3e26b646c18e320086f733344c8fe3dc2437771cec7e75a532e55d13e0b660d4428ca0dac9d39617e
-EBUILD mkvtoolnix-9999.ebuild 2947 BLAKE2B 9d53d0101d17168a8348b2eba59a8116df2db9b622f8db14e16ca93a19f8759f5ea2a525de6f3e6583173041ca67803d0541102839001bff58703016c2e31ba8 SHA512 412ae24661446597aeeea66bbdb85097515122d9df4a75a2324e6471893622e69d41aeaf20ff5d9d360011f2b7fe803140cd01cbb677dfe9e1ca9bd810557e3e
+EBUILD mkvtoolnix-68.0.0-r3.ebuild 2980 BLAKE2B a7319bb5c1d79c2aae66e770ca1b47c7b31c8fcc4493464e5858d5b95bc7007cf57d1150d8d86e400d7e346fd410076461450ea605a6487269f37a03d57f0fdc SHA512 ae05fc55bc96b737dbbba190c8290fce78d9a745522fc5ac5c1e766ee80ab4cee2a72894fa236fab2858a50c5819cf9c9120a4cf70defb5b1e671a05ade08dbe
+EBUILD mkvtoolnix-9999.ebuild 2948 BLAKE2B fb49d9e001092d07f347ec622247943d8a06b1b31d9b2ecf80bd2009d8e37118c6cc1751d2e5cf6529fa73cb1e73879c431d1329576525636a093fdbee7afe18 SHA512 8d5b9e3d413ce32b352f0dbc35c153f2b5dc765912bbd39597b7bcebdfe99966964c75ffe3f2ceb614d767a4557ddf2e979b702441e5929fb8d2441f8670d42b
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
similarity index 99%
rename from media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
index 50ff6904bf4e..f5a1084acaf8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
@@ -37,8 +37,8 @@ RDEPEND="
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
 	dev-qt/qtcore:5
-	dev-qt/qtsvg:5
 	gui? (
+		dev-qt/qtsvg:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 6e76d9b6573b..3b7b072da517 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -37,8 +37,8 @@ RDEPEND="
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
 	dev-qt/qtcore:5
-	dev-qt/qtsvg:5
 	gui? (
+		dev-qt/qtsvg:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index d2c6664647a7..0921b11506cf 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,4 @@
+AUX mpv-9999-docdir.patch 536 BLAKE2B eeb4bec0a51a68515c7c321a4419679e4b6d0567db2145ce44f0ff5141b2043ec3de057607dca0798f2d63f7b5f2e8fde3ed87be725e156e0b769ca561598702 SHA512 e8a122dec7adea75681e285378d99a7f94f4f75926cbde65dd5f0c7014b4a49d4567e719d92a9d9d428f8f746ff0cd3495ba59c5e7b3acb43d83329a10b338c5
 DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
 DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
 DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
@@ -6,5 +7,5 @@ DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae0
 EBUILD mpv-0.33.1-r3.ebuild 9698 BLAKE2B 18a25640c9ba5e3d1b3f06d75d1f9eca75a2eb202a67b6107a9e1704012ef3b20f819ab7e38567068439450b3c9feba916a484ab34e7fca94ec47623965878c0 SHA512 4358a7a120e72cb6cb036aaa30469d534eaecb7596017b3a54ad07443f89732102eb037b9c22fddcd95cbb7660ef0a59fb2f5476b7dbc3e78a804a0d94947a51
 EBUILD mpv-0.34.0-r1.ebuild 9701 BLAKE2B fd2f7cbeabd539efa9625d476efdf86bd15de954f100fbdb01ee3549fb92fcf380d9bbcf003dec17d901711007c822b01274a535ff92caa09c978edfbf20db97 SHA512 78ed75d5e4393aacbcba8f223cacc00ea88184c30df9316b7daf4ec2e52b3f65fbd3661468639e9a5ebf52d14e336cf358ccad2659c386ef3052012ce107a572
 EBUILD mpv-0.34.1-r1.ebuild 9697 BLAKE2B 91b819898ec285d53675ec92cbc988db16d943f68a5ec54ff1334064a4aeb67033a2375d8398000a1e6d732b2267b9e813ca4a9e6dfde5950a3c4fba51994cbd SHA512 250ed490a9fdc3ab9133f8ddd4195d6820679293bdab104cec9fb3efbc385cfa8e5207321b7bbab20fa16f45e2cee937ac5b74c86dbab0b0a680317d9c724e2c
-EBUILD mpv-9999.ebuild 9724 BLAKE2B 4f539d603252eeb344634f958db5d36fe915205a6d38ecd5bef42de866dd99d7a6979bd4554d673b6ede0adcb992d5fadbc59b994c6ea536704fa64e42bda315 SHA512 b6a755f113b588482d0d0f8f8dc4822dbf2fb6c74a5d1d4213b4ad5269a979f3071d717f8a1e498aca5c76dc91df33f55dacb09affb6fd9e61a963d34513bd14
-MISC metadata.xml 2137 BLAKE2B fe78cb8478cac266c72c939fd87043c0a685c12c840e0966d34d58b1c9dd39767197d93762d8150454a5e2f58ecf0c68cde1289bb392cd92b0d199a81d5f4ff6 SHA512 bd37f4f676eaf2507484d28b0b29f861e575a6232bc67413cae1c09fd16481d5a62b2646ee2e9e5b5a0c5bd8a0dfa63d1b4ef80e3f70c1ef8ff040d103fd6beb
+EBUILD mpv-9999.ebuild 9205 BLAKE2B 8f66b018de4030aa77cf560b9fd0e37f16acc4f821fa5777550dc52cc468d7c613158e59ed511dd27539bde066a92d1c34846cbd0716f2cd0bc3eaa8187aeae8 SHA512 6ea59a928d078c1e2ecc7bdf774a7f486986e5522546131d1ff49fad0685d46665cd6b964f7dab89ee7e41ea13b8476bd771bed0e269fea29537cfb78218f43e
+MISC metadata.xml 2562 BLAKE2B f53ed5de0b371b102412e050901ba3c58f0c1cdd5e5aba6c3f0fd2ac46fffdf3d87022299489cfb6388573edf9ac3a501488939dc4e9d77527efe6fd65102f55 SHA512 fae81e9b21accc130249475ae50e02e48ea1ddf0ea3e6e332d41275ccf4552131a4bf0e7a15856e909572ed0f5c86163b0a7a10d3e13a2015c650e741d63a373
diff --git a/media-video/mpv/files/mpv-9999-docdir.patch b/media-video/mpv/files/mpv-9999-docdir.patch
new file mode 100644
index 000000000000..62a57415163b
--- /dev/null
+++ b/media-video/mpv/files/mpv-9999-docdir.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1856,7 +1856,7 @@ if get_option('cplayer')
+ 
+     conf_files = ['etc/mpv.conf', 'etc/input.conf',
+                   'etc/mplayer-input.conf', 'etc/restore-old-bindings.conf']
+-    install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'mpv'))
++    install_data(conf_files, install_dir: join_paths(datadir, 'mpv'))
+ 
+     bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
+     install_data('etc/mpv.bash-completion', install_dir: bash_install_dir, rename: 'mpv')
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 8f8efa409921..656c28187c05 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -17,14 +17,18 @@
 		<flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
 		<flag name="libmpv">Build mpv shared library</flag>
 		<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
+		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
 		<flag name="opengl" restrict="&lt;media-video/mpv-0.28.0">Enable the recommended 'opengl' video output</flag>
 		<flag name="opengl" restrict="&gt;=media-video/mpv-0.28.0">Enable support for various OpenGL-based video backends</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
+		<flag name="pipewire">Enable sound support via native PipeWire backend</flag>
 		<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
 		<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs
 			(Note: these outputs exist for compatibility reasons only, avoid if possible)</flag>
+		<flag name="sndio">Enable sound support via <pkg>media-sound/sndio</pkg></flag>
 		<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
 		<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
+		<flag name="vector">Use function implementations more amenable to vectorization (gives speedup). Made optional in case of bugs.</flag>
 		<flag name="vulkan">Enable support for various Vulkan-based video backends</flag>
 		<flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag>
 	</use>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 647b7976525a..0958d7c9fee9 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,38 +1,40 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 
-WAF_PV=2.0.22
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+inherit edo flag-o-matic lua-single optfeature meson pax-utils python-single-r1 toolchain-funcs xdg
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+
+	DOCS=()
+else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+
 	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-	DOCS=(); SRC_URI=""
 fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+
 DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
+# See Copyright in sources and Gentoo bug #506946. libmpv is ISC.
+# See https://github.com/mpv-player/mpv/blob/6265724f3331e3dee8d9ec2b6639def5004a5fa2/Copyright which
+# says other files may be BSD/MIT/ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD MIT ISC"
 SLOT="0"
 IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
 	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
-	nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
-	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
+	mmal nvenc openal +opengl pipewire pulseaudio raspberry-pi rubberband sdl
+	selinux sndio test tools +uchardet vaapi vdpau +vector vulkan wayland +X +xv zlib zimg"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -79,17 +81,19 @@ COMMON_DEPEND="
 	)
 	jack? ( virtual/jack )
 	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	lcms? ( >=media-libs/lcms-2.6:2 )
 	>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
 	virtual/ttf-fonts
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	lua? ( ${LUA_DEPS} )
 	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
 	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
 	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	sndio? ( media-sound/sndio )
 	vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
@@ -118,7 +122,6 @@ COMMON_DEPEND="
 	zimg? ( >=media-libs/zimg-2.9.2 )
 "
 DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
 	dvb? ( virtual/linuxtv-dvb-headers )
 	nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 "
@@ -129,21 +132,18 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="dev-python/docutils
 	virtual/pkgconfig
-	test? ( >=dev-util/cmocka-1.0.0 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-docdir.patch
+)
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default
+	use tools && python-single-r1_pkg_setup
 }
 
 src_configure() {
-	python_setup
 	tc-export CC PKG_CONFIG AR
 
 	if use raspberry-pi; then
@@ -151,133 +151,138 @@ src_configure() {
 		append-ldflags -L"${ESYSROOT}/opt/vc/lib"
 	fi
 
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize # Don't add '-O2' to CFLAGS.
-		$(usex debug '' '--disable-debug-build')
-
-		$(use_enable doc html-build)
-		--disable-pdf-build
-		--enable-manpage-build
-		$(use_enable cplugins)
-		$(use_enable test)
-
-		$(use_enable iconv)
-		$(use_enable lua)
-		$(use_enable javascript)
-		$(use_enable zlib)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth # Only available in overlays.
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
+	if use debug && ! use test; then
+		append-cppflags -DNDEBUG
+	fi
+
+	local emesonargs=(
+		-Dbuild-date=false
+		$(meson_use cli cplayer)
+		$(meson_use libmpv)
+		$(meson_use test tests)
+
+		$(meson_feature doc html-build)
+		-Dmanpage-build=enabled
+		-Dpdf-build=disabled
+
+		$(meson_feature cplugins)
+		$(meson_feature iconv)
+		$(meson_feature javascript)
+		$(meson_feature zlib)
+		$(meson_feature bluray libbluray)
+		$(meson_feature dvd dvdnav)
+
+		$(meson_feature cdda)
+
+		$(meson_feature uchardet)
+		$(meson_feature rubberband)
+		$(meson_feature lcms lcms2)
+
+		# Only available in overlays.
+		-Dvapoursynth=disabled
+
+		$(meson_feature vector)
+
+		$(meson_feature archive libarchive)
+
+		-Dlibavdevice=enabled
 
 		# Audio outputs:
-		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
+		$(meson_feature sdl sdl2-audio)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature pipewire)
+		-Dopensles=disabled
+		$(meson_feature alsa)
+		$(meson_feature coreaudio)
+		$(meson_feature sndio)
 
 		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland wayland-scanner)
-		$(use_enable wayland wayland-protocols)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable vulkan shaderc)
-		$(use_enable vulkan libplacebo)
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		$(usex opengl '' '--disable-gl')
-		$(use_enable vulkan)
-		$(use_enable gamepad sdl2-gamepad)
+		$(meson_feature sdl sdl2-video)
+		$(meson_feature aqua cocoa)
+		$(meson_feature drm)
+		$(meson_feature gbm)
+		$(meson_feature wayland)
+		$(meson_feature X x11)
+		$(meson_feature xv)
+
+		$(meson_feature opengl gl)
+		$(usex opengl "$(meson_feature aqua gl-cocoa)" '-Dgl-cocoa=disabled')
+		$(usex opengl "$(meson_feature X gl-x11)" '-Dgl-x11=disabled')
+
+		$(meson_feature egl)
+		$(usex egl "$(meson_feature X egl-x11)" "-Degl-x11=disabled")
+		$(usex egl "$(meson_feature gbm egl-drm)" "-Degl-drm=disabled")
+		$(usex opengl "$(meson_feature wayland egl-wayland)" '-Degl-wayland=disabled')
+
+		$(meson_feature vdpau)
+		$(usex vdpau "$(meson_feature opengl vdpau-gl-x11)" '-Dvdpau-gl-x11=disabled')
+
+		$(meson_feature vaapi) # See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(meson_feature X vaapi-x11)" "-Dvaapi-x11=disabled")
+		$(usex vaapi "$(meson_feature wayland vaapi-wayland)" "-Dvaapi-wayland=disabled")
+		$(usex vaapi "$(meson_feature gbm vaapi-drm)" "-Dvaapi-drm=disabled")
+
+		$(meson_feature libcaca caca)
+		$(meson_feature jpeg)
+		$(meson_feature vulkan shaderc)
+		$(meson_feature vulkan libplacebo)
+		$(meson_feature raspberry-pi rpi)
+		$(meson_feature mmal rpi-mmal)
+
+		-Dsixel=disabled
+		-Dspirv-cross=disabled
+
+		$(usex libmpv "$(meson_feature opengl plain-gl)" "-Dplain-gl=disabled")
+		$(meson_feature opengl gl)
+		$(meson_feature vulkan)
+		$(meson_feature gamepad sdl2-gamepad)
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable nvenc cuda-hwaccel)
-		$(use_enable nvenc cuda-interop)
+		$(meson_feature nvenc cuda-hwaccel)
+		$(meson_feature nvenc cuda-interop)
 
 		# TV features:
-		$(use_enable dvb dvbin)
+		$(meson_feature dvb dvbin)
 
 		# Miscellaneous features:
-		$(use_enable zimg)
+		$(meson_feature zimg)
 	)
+
 	if use lua; then
-		if use lua_single_target_luajit; then
-			mywafargs+=( --lua="luajit" )
-		else
-			# Because it would be too simple to just let the user directly
-			# specify the package name to check, wouldn't it.
-			mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
-		fi
+		emesonargs+=( -Dlua="${ELUA}" )
+	else
+		emesonargs+=( -Dlua=disabled )
 	fi
 
 	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable egl vaapi-x-egl)
+		emesonargs+=(
+			$(meson_feature egl vaapi-x-egl)
 		)
 	fi
 
 	# Not for us
-	mywafargs+=(
-		--disable-android
-		--disable-egl-android
-		--disable-uwp
-		--disable-audiounit
-		--disable-macos-media-player
-		--disable-wasapi
-		--disable-ios-gl
-		--disable-macos-touchbar
-		--disable-macos-cocoa-cb
-		--disable-tvos
-		--disable-egl-angle-win32
+	emesonargs+=(
+		-Duwp=disabled
+		-Daudiounit=disabled
+		-Doss-audio=disabled
+		-Dwasapi=disabled
+
+		-Dd3d11=disabled
+		-Ddirect3d=disabled
 	)
 
-	mywafargs+=(
-		--bashdir="$(get_bashcompdir)"
-		--zshdir="${EPREFIX}"/usr/share/zsh/site-functions
-)
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+	meson_src_configure
+}
 
-	waf-utils_src_configure "${mywafargs[@]}"
+src_test() {
+	edo "${BUILD_DIR}"/mpv --no-config -v --unittest=all-simple
 }
 
 src_install() {
-	waf-utils_src_install
+	meson_src_install
 
 	if use lua; then
 		insinto /usr/share/${PN}
@@ -291,7 +296,7 @@ src_install() {
 	if use tools; then
 		dobin TOOLS/{mpv_identify.sh,umpv}
 		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"/usr/bin/umpv
+		python_fix_shebang "${ED}"/usr/bin/umpv
 	fi
 }
 
@@ -342,18 +347,3 @@ pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4f8367baaaef..2fa5d81a09f5 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,6 +2,7 @@ AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3
+AUX pipewire-0.3.54-audioconvert-samples.patch 736 BLAKE2B fdff5ee71e924d325a0ce652ae1ec9e7ebf99826d7226d21b2578657b7a58ae53461924204c6723fa4dd7da707aa3cb6be4b0a0e3aa963818ddb4fc42952efea SHA512 65ef384a444ab7e07fe14e3b33bdcfa9d651ff1c6400f9b83bb267967a4b21d203c60c59c6ad9051e50d0bf164b2f6048f1956f0bed0752ed05d75184fd383cb
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
@@ -10,10 +11,13 @@ DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd823
 DIST pipewire-0.3.53.tar.gz 1783505 BLAKE2B 269466c6ba78cb85516dc714f3aa5d71cdf72a859b6e1a11c60062da6dcd56eefc78958fe026b9fd11d61fd6fbe6f2aac54a2a9fd77d4ee474687f5d54628c38 SHA512 50f23a7b71f3eb20657ff75de54a9f3056270bf05a5472ec9c7dea1c9d0ed391b6b09496d58b065c3cbc40f9be8088b6737cbf0731973498bcd5a8176c42d443
 DIST pipewire-0.3.53_p20220704.tar.bz2 1351516 BLAKE2B 3d4e4859c66e9cbe47adc0f1c0e2e512632793d70853e0105984c06d2e66744b68d1c01dc7a85784ca2007a96aa5fd1c62c7f47ea6360df58ff76b87de4d3ee2 SHA512 87819aa5bdd3caa685c0fc93b0ddcf8212f115cecc130155918876c10883bd98ce923fef3f9716b2562ef5ae2b5465d9e39816f4b6e0c48cf9f28303755584b6
 DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c SHA512 631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152
+DIST pipewire-0.3.54.tar.gz 1789544 BLAKE2B 66b28b36aee0672a1bc8059beb18bf0868d8c01f01823151a732ca8e616860beb1ff4c8eb611f6f17bc99e4201bd1ba8ef44fb8968cedd56be3370e279c75bed SHA512 affb8b4fefd8c1cd3064df0987117931a03e967461d6b8125e3f390b83f6dda1a11d6b30e81590f4780f607b763061dd7a26a7686816dd2801f03d64d43ab8f2
 EBUILD pipewire-0.3.51-r2.ebuild 13194 BLAKE2B 8be112d99c48d5699dc51efe5bb3cff9509d4787f42f97df4ae4c14c254699e13750d2bbf3abf87a4102e763ffec7cd3a49103d29909284d4e94b35a04c0e965 SHA512 3504398ade620b89890c85c18aafa61707068e488ef2c1d1bfda8d9d429cadbf3cfbe333c42b2229201bf778c96e71e333e0d4a08fff59286149ccb1fa7634eb
 EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8
 EBUILD pipewire-0.3.53-r1.ebuild 14904 BLAKE2B 26d1fa2c5d616d767b2e333e39e165ce909721692bdcc18d62d15c0249ad00c254aaa25b77a5ca6f60241c2f4b39973db4be77aea9a10548599c5baca97550e6 SHA512 a8f6778d442966547a6ed1314e0f02b8458de2f23d0c154fe543ae0e6be78ad47bd3869f8afd932c9c6908eaf2944d62104a5e1e2a0e6280d3884bedf8274a2a
 EBUILD pipewire-0.3.53_p20220704-r1.ebuild 15027 BLAKE2B 04db04cab0edbabc5fd6bb7896592827433501f09a80b2132dc22d33f898e9fe5aab2b8c696de9aca5bb458d2927bd24c2a710354f6b6df6280c1a2819baca5f SHA512 3e4e79486e83e7d191eccb84ab9c04a189c516158662c9f9cc735841989e608a07cdc82765d35a9d1083ff234041e2b183c3ac19e91a810907fdb78d3476fd91
 EBUILD pipewire-0.3.53_p20220705-r1.ebuild 15132 BLAKE2B c384019726ec2652d2032cf09f31bf8b6ef8d1453ceb111921f4a437148f5c66808f6d8a13196d211fb88c7ed7fd46703d89a7341047bb8e1787f3d1661c1fb5 SHA512 184e710cc6d91b4c648f0bbf29bf04523c23936bfb259791a6db47ed61263a4ba135e29c80049553c32e03540fe67f409084919906b09a1b8f2ac1f562263ba3
-EBUILD pipewire-9999.ebuild 15092 BLAKE2B c142ff95c8bd6b1ba2cd32518369924576680001152a6fde60c407ae6106d7d411a4d31e60166639de462c7bb8663f9d4024a1f320be63be3896f32596ec5f84 SHA512 5a8e58b10f1d7e0d8075ca026aad2b90efffe86fd37d0402efdd6d3a99d7610745bddbb4d314a2c57ab40fa9f238b00e650c442a70be301f0fc85319f11bff3e
+EBUILD pipewire-0.3.54-r1.ebuild 15474 BLAKE2B 0cafa483c17190a3d12d049bdf533ea2871795e6efd09bb0842cc6acbb78389f4cf0ff773b6e27c89674078593aec69588c362a47012787f51644f384c33719a SHA512 1725b191017fc944c1386e6e59dee6047ef0084e343e953bec4580efa85d4ec762e684f97a22cc9ba908f7a0189caa3efd5f4f63fff0bf37e69789cd72d1ea1f
+EBUILD pipewire-0.3.54.ebuild 15427 BLAKE2B 739879fa7fa51f0ea91cf05a1494594a2b8bf1e8de2f580c6a04ee04c674773025b02b820f390592b493dae25aa163a5b738436a3497be9d5ffc7c10e613f1db SHA512 243c42ef5213eeccc6355670cee87b510c43fbde42408ffcc985a44746ece94af93bb15d80c2a850e7b3925aac90fe67801e1ba5670caf27dfcab9fdd4b1c6aa
+EBUILD pipewire-9999.ebuild 15427 BLAKE2B 739879fa7fa51f0ea91cf05a1494594a2b8bf1e8de2f580c6a04ee04c674773025b02b820f390592b493dae25aa163a5b738436a3497be9d5ffc7c10e613f1db SHA512 243c42ef5213eeccc6355670cee87b510c43fbde42408ffcc985a44746ece94af93bb15d80c2a850e7b3925aac90fe67801e1ba5670caf27dfcab9fdd4b1c6aa
 MISC metadata.xml 1594 BLAKE2B 5291d3254924bd4710238933a4de6c46af4cd9aee9e688fb09878e310c75e6c6c39a154fd9ee3e85c0b59920590fb590a79882c2efc69551630d291bee69311e SHA512 7d0c3f41df7994338ae7506c8501beae032e6630bf3bed72854a324281ed234d3bbc0bc5100a4687d68256480c965b07e53276157e6366a95d08a4071a2389e5
diff --git a/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
new file mode 100644
index 000000000000..9c231a9f28f5
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7b0106883716cb0fa72a2b3c4715175607ec658a
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 8 Jul 2022 09:23:31 +0200
+Subject: [PATCH] audioconvert: consume right amount of input samples
+
+When we are not using the resampler, we consume the same amount of
+input samples as output samples.
+
+Fixes #2519
+--- a/spa/plugins/audioconvert/audioconvert.c
++++ b/spa/plugins/audioconvert/audioconvert.c
+@@ -2542,8 +2542,8 @@ static int impl_node_process(void *object)
+ 		this->in_offset += in_len;
+ 		n_samples = out_len;
+ 	} else {
+-		this->in_offset += n_samples;
+ 		n_samples = SPA_MIN(n_samples, n_out);
++		this->in_offset += n_samples;
+ 	}
+ 	this->out_offset += n_samples;
+ 
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.54-r1.ebuild b/media-video/pipewire/pipewire-0.3.54-r1.ebuild
new file mode 100644
index 000000000000..f8b1bc7b1bc0
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.54-r1.ebuild
@@ -0,0 +1,421 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	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
+	)
+	lv2? ( media-libs/lilv )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-audioconvert-samples.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.54.ebuild b/media-video/pipewire/pipewire-0.3.54.ebuild
new file mode 100644
index 000000000000..449554e6270c
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.54.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	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
+	)
+	lv2? ( media-libs/lilv )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index f831949d2b1c..449554e6270c 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -3,6 +3,13 @@
 
 EAPI=8
 
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
 PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 4c7de64f1d1e..d9ed0f7fe30e 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,8 +4,12 @@ AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch
 AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1
 AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb
 AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d
+AUX wireplumber-0.4.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
-EBUILD wireplumber-0.4.10-r4.ebuild 3947 BLAKE2B 60ddc73ba8f8e094fca2e8c96df2dd1965ef47be6d59a298291dae05c654f85bcdc22a940c7b92690f88da8c46185f5971c2dfa794dfed0ed64ace1fc75755c4 SHA512 981b681bf07e54cda72be186c2cb1e7208e9dccdc2e7fa2d13c22dc651ce86d8cb257612b8ad4e0c82b8fd38b4a329ef23ee2c87249fdcc755f2b4ad1d86c696
-EBUILD wireplumber-0.4.10-r6.ebuild 4076 BLAKE2B d6095fcaf6f12a59707752b33d7a83f4e5b4ba705e8931c4a0a7ba0d8b7dea545f9035f0a4d8d682e312c2609084f0f74300f8549d032945e8bc8b717fbcdf60 SHA512 8d89a0fdca94ecbb4d42d1c0de9a8ef70c5898fe38c274497ad8ddadc7c7b4f5273b427a72c808121dd16c45da56be3cae073715d9f1bfa440a53dbdb4550625
-EBUILD wireplumber-9999.ebuild 3566 BLAKE2B dbe6c6f1b9580e54cfb2bdf0203ec32f370ce9609d5df73b9c8a45efee084f228740c10fef47cb4657a947033f11e72195ef5cee4d230692ef97dfeeee7fbb87 SHA512 a4bc9f1e82d38f944abdb236c1e261511b9b30d5434dda70b15c1b2277c7235d9141c8e1caebd82ad08da32c46d7086049859c56addf4260c515787b335904bc
+DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
+EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca
+EBUILD wireplumber-0.4.10-r6.ebuild 4062 BLAKE2B 5706c5fe1a0f68900c9b2eb9131de0aa68ed5b1c51923bab01d557283452f6bc8e9d092f3aa0b182e3c9163a18061cd07fd821f61754ffd9c8355dcd5149d688 SHA512 8a74fc5f82c40ae63660c941d2b6d59189f852b7594a3eaf9f7539eae68917297168ebbd5f5a9c32acca6a10d2ab4b0351812dd7c39dac6da752c619bbbc08da
+EBUILD wireplumber-0.4.11-r1.ebuild 4071 BLAKE2B 724bb567cf077985bcd0e9d58649c6e6c8c75f04babb56c503c05416fde901bef4330930e735b6b9e3658ea66369cc8829a30be6ec780a41f8eca33b26454a21 SHA512 7e8e40f7f3d727776881004e01a109e7a7711668a3a8738a960cb2326edb55fe854f0932ca07ff31255bbdc200013e6498933443eb115661052122b517e0dcf5
+EBUILD wireplumber-0.4.11.ebuild 4030 BLAKE2B e93cabeffc20578ba0d3c70e02db1d7b1108e76229bad1dfefd48c887d6d60dc704cbb7a323ba04e42f8674d0d48d70926c24adeecc724bc28c647bb9c9e30dc SHA512 c4deb8102d90102f2c66430e178b7cde7bac734243b94e17497ee8b64159879b17a9d59edca0558c9df928f51b52105b8970c1cf6e1f490603b17173342f754e
+EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae
 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e
diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch
new file mode 100644
index 000000000000..3bc8bbd08bb6
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch
@@ -0,0 +1,33 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253
+
+From c16e637c329bc9dda8544b18f5bd47a8d63ee253 Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis@collabora.com>
+Date: Thu, 7 Jul 2022 20:58:36 +0300
+Subject: [PATCH] alsa: use "obj_type" as a variable name to avoid shadowing
+ lua's "type" function
+
+This causes a crash when running in a VM because the code tries to
+execute lua's "type()" and ends up executing the local string variable...
+
+Fixes: #303
+--- a/src/scripts/monitors/alsa.lua
++++ b/src/scripts/monitors/alsa.lua
+@@ -49,7 +49,7 @@ function nonempty(str)
+   return str ~= "" and str or nil
+ end
+ 
+-function createNode(parent, id, type, factory, properties)
++function createNode(parent, id, obj_type, factory, properties)
+   local dev_props = parent.properties
+ 
+   -- set the device id and spa factory name; REQUIRED, do not change
+@@ -199,7 +199,7 @@ function createDevice(parent, id, factory, properties)
+   end
+ end
+ 
+-function prepareDevice(parent, id, type, factory, properties)
++function prepareDevice(parent, id, obj_type, factory, properties)
+   -- ensure the device has an appropriate name
+   local name = "alsa_card." ..
+     (properties["device.name"] or
+GitLab
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
index ac75996452f4..820d1ed7d4a3 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
 	>=media-video/pipewire-0.3.48:=
-	virtual/libc
 	virtual/libintl
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
index 84e7919f00ed..5a21755d5858 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
 	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libc
 	virtual/libintl
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild
new file mode 100644
index 000000000000..9b738b1c7ac8
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.53-r1:=
+	virtual/libintl
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	"${FILESDIR}"/${P}-alsa-lua-crash.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Dintrospection=disabled # Only used for Sphinx doc generation
+		-Dsystem-lua=true # We always unbundle everything we can
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		$(meson_use system-service systemd-system-service)
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# We copy the default config, so that Gentoo tools can pick up on any
+	# updates and /etc does not end up with stale overrides.
+	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
+	# will not actually get stored twice until modified.
+	insinto /etc
+	doins -r "${ED}"/usr/share/wireplumber
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/wireplumber/wireplumber-0.4.11.ebuild b/media-video/wireplumber/wireplumber-0.4.11.ebuild
new file mode 100644
index 000000000000..ac3004d7449f
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.11.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.53-r1:=
+	virtual/libintl
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Dintrospection=disabled # Only used for Sphinx doc generation
+		-Dsystem-lua=true # We always unbundle everything we can
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		$(meson_use system-service systemd-system-service)
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# We copy the default config, so that Gentoo tools can pick up on any
+	# updates and /etc does not end up with stale overrides.
+	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
+	# will not actually get stored twice until modified.
+	insinto /etc
+	doins -r "${ED}"/usr/share/wireplumber
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index f40f12b41eae..2a10e58f8187 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -3,6 +3,13 @@
 
 EAPI=8
 
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
 LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single meson systemd
@@ -43,7 +50,6 @@ DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
 	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libc
 	virtual/libintl
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3939d8d99574..e568a933dc78 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 65efe0a843e5..e22246fad78d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2022 11:39:40 +0000
+Sun, 10 Jul 2022 14:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d59c24fe3dce..a2330eb4b6fa 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-08T11:39:43Z
+TIMESTAMP 2022-07-10T14:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLIF39fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLK5LNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klALSw//YZDNS4WWbeT/ImMKhakVbjNfXd51Nkl7y3qbGX+S+du+FMgC/9O8I0+M
-efnYK7tSkpiOmHQ81mM9enghZYFLDDlYNJs/7drxq+WnHKa5JwZsd+Q1fLyW+oGd
-zAt88n0DEfhqIBOC5yu11OZEuNLFI5BStl/zcSV8cHFC1AFdcKecXMSBe89rsY+a
-/g1X9LEf3/d5KFMcLwjrx87UhFI1clrOjbFCOHufCFYGQvWYEFAXWaXdnhbLGWw3
-3WBhwZtDHXbQNvt5Q7cKbxijQw/+f3lNnBQ5LvJiT4BH75wE8ARtZZloAFsGdzzp
-rPjzvOattC2f14nmx+Y0D91PldUNKQ1xzOv5gUyWH8jV/7ZtcawhfHudpE5H8A8m
-Ug/0QoopYvIMPqhowFYglkCkGpPd797f+jUyZ9/RX+DUlrPGYbHTDDE2imDzkdsS
-yIHDhVhG5ksErl8ktR5TjSXl1jtZBSptGrijIqE9E/lgZq581ZNrfQoZ9zwrTVAV
-SdaRR+5GtnAYgZf5QjtCvYTO9MINTEXvG/fjxr1FG6TQiT3e9JHw0JteixbOWa07
-/3bYucmdTy48LBMalNK5vTraeZYVpFvJM/LCT+3XEAuEnBmfVS3QWHKI1ifxk5lc
-UhiFfookPd141SLNdm/BrCpiUGoe+Gar/qQWs5rmsmMMuieD6lM=
-=ISeB
+klDdig//YU7fXNw0L6poBSgv8grsVLh6Z6AZWFsUeiJ6lcDKno9exkAqh39EiBya
+9rSuGgN+4Y1447NDURv10gKZ5gOnoH36rAfZY3+SjR2FfFO4ffy918LRCsPGCedw
+ozXhHrMka99pdCK2nS7l/OG5bFbAPCy0xkpbu1rjdBvDgd0JSjat0kO+mS5P+rJd
+FaszXFaxoudqORjR+SSs2+2WXXmY3lZj+XJPDymFxpqLMhn6bkUWu003bUiqT5BY
+fq15WmLXtx3Al6i0bhHRGcpDvUo2rS4Z4I1irOTbbIHfx7+5VycSOFjCd4SRRdxs
+4tJmVW2RvRldziKAw2L5ElhfkzPfybmZIOLnb/6tBBR9F4R5bFiss5BFolEHOfu6
++8hJmP1qiS6zkopGpvpbm16jMo/3ChXcxL/rNuiEzvcKJbCuMM6ObZfgZjkpSnbd
+quKkXq9TtZq0Z3a7KS5pRjCBndW77ADRAvSeRWgSmI2NgUrCPijzObh9rAuMWDwc
+l68KzpllOslNDMBxt128N5Kz7YJyKdLQR6UyHRvYUoL6GTSFl6XmnFkIMdoH7lks
+XWSsDF79Es45gi2tdnLcT27Avtqj2BKVHsFF3KF21BdxbiQD/W5ed+/94goRs1UP
+7PyvM6kjJm49/XuNVUKCTXcLBp4+DXNwFP+mXUAeKmyVNn2Yx2I=
+=HR2T
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 65efe0a843e5..e22246fad78d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2022 11:39:40 +0000
+Sun, 10 Jul 2022 14:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b929d1fffedd..4c9d83012f98 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 359e54032847..9db5bd4e21a0 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/abrt-0-r1 b/metadata/md5-cache/acct-group/abrt-0-r1
index 7786a6ffa8ef..9dd61cffeb7d 100644
--- a/metadata/md5-cache/acct-group/abrt-0-r1
+++ b/metadata/md5-cache/acct-group/abrt-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=10b6398abb7c2e46973b98c2bd1b0055
diff --git a/metadata/md5-cache/acct-group/adm-0-r1 b/metadata/md5-cache/acct-group/adm-0-r1
index 647cdc10af7a..28ae76e29bca 100644
--- a/metadata/md5-cache/acct-group/adm-0-r1
+++ b/metadata/md5-cache/acct-group/adm-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1d6571af81b68752be9743e541e43e5d
diff --git a/metadata/md5-cache/acct-group/aerospike-amc-0 b/metadata/md5-cache/acct-group/aerospike-amc-0
index fb1ef410f055..67e90191a9e2 100644
--- a/metadata/md5-cache/acct-group/aerospike-amc-0
+++ b/metadata/md5-cache/acct-group/aerospike-amc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ddaca2db35f773d03feff25bc5d4afef
diff --git a/metadata/md5-cache/acct-group/airdcppd-0-r1 b/metadata/md5-cache/acct-group/airdcppd-0-r1
index feac216db580..2fece0fb60aa 100644
--- a/metadata/md5-cache/acct-group/airdcppd-0-r1
+++ b/metadata/md5-cache/acct-group/airdcppd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f924bc0a91f26abf3b6d5b80e33e5e3e
diff --git a/metadata/md5-cache/acct-group/alertmanager-0 b/metadata/md5-cache/acct-group/alertmanager-0
index c65693fc93ee..ad4f6628c617 100644
--- a/metadata/md5-cache/acct-group/alertmanager-0
+++ b/metadata/md5-cache/acct-group/alertmanager-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6f57e83ae26cb862b182b16b00779484
diff --git a/metadata/md5-cache/acct-group/amanda-0 b/metadata/md5-cache/acct-group/amanda-0
index 134c5b533b1b..d1389d040f54 100644
--- a/metadata/md5-cache/acct-group/amanda-0
+++ b/metadata/md5-cache/acct-group/amanda-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0635855ebd8437206eac277d3df1ab0b
diff --git a/metadata/md5-cache/acct-group/amavis-0-r1 b/metadata/md5-cache/acct-group/amavis-0-r1
index 14ffc234a4ae..8944f2794acc 100644
--- a/metadata/md5-cache/acct-group/amavis-0-r1
+++ b/metadata/md5-cache/acct-group/amavis-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5f7c0aa5d8e477f0d186563309904523
diff --git a/metadata/md5-cache/acct-group/amule-0-r1 b/metadata/md5-cache/acct-group/amule-0-r1
index e472ba0a2127..5c105fe5c075 100644
--- a/metadata/md5-cache/acct-group/amule-0-r1
+++ b/metadata/md5-cache/acct-group/amule-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c29b2069aed0cdb0ec1e5020f1b24f83
diff --git a/metadata/md5-cache/acct-group/android-0 b/metadata/md5-cache/acct-group/android-0
index 065cab5748a0..d7277946f929 100644
--- a/metadata/md5-cache/acct-group/android-0
+++ b/metadata/md5-cache/acct-group/android-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3a9dcc8bc3b31fa8b57136a7c38cebef
diff --git a/metadata/md5-cache/acct-group/anope-0-r1 b/metadata/md5-cache/acct-group/anope-0-r1
index 58868ce16c88..f17c5cfab60e 100644
--- a/metadata/md5-cache/acct-group/anope-0-r1
+++ b/metadata/md5-cache/acct-group/anope-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=585a94bcfbd4a948c1d00460302de69a
diff --git a/metadata/md5-cache/acct-group/apache-0-r2 b/metadata/md5-cache/acct-group/apache-0-r2
index 85958dc26ef3..05d5e697396d 100644
--- a/metadata/md5-cache/acct-group/apache-0-r2
+++ b/metadata/md5-cache/acct-group/apache-0-r2
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2038b87875f983dedf4dc101d91a590b
diff --git a/metadata/md5-cache/acct-group/apt-cacher-ng-0 b/metadata/md5-cache/acct-group/apt-cacher-ng-0
index bdeaacfc7513..691e5439a133 100644
--- a/metadata/md5-cache/acct-group/apt-cacher-ng-0
+++ b/metadata/md5-cache/acct-group/apt-cacher-ng-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9606ab0a5d5490f43e18855edb1f8a0c
diff --git a/metadata/md5-cache/acct-group/argus-0 b/metadata/md5-cache/acct-group/argus-0
index e2785605d331..7dc784283bbe 100644
--- a/metadata/md5-cache/acct-group/argus-0
+++ b/metadata/md5-cache/acct-group/argus-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ab3bdf1449731973c570a00ced92ae41
diff --git a/metadata/md5-cache/acct-group/arpwatch-0 b/metadata/md5-cache/acct-group/arpwatch-0
index 08d34e52545e..c6d8382c8d51 100644
--- a/metadata/md5-cache/acct-group/arpwatch-0
+++ b/metadata/md5-cache/acct-group/arpwatch-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=18abf91633100aa1afeb6e5bd1b27928
diff --git a/metadata/md5-cache/acct-group/artifactory-0 b/metadata/md5-cache/acct-group/artifactory-0
index 8c2a560741b1..d6c7446e880f 100644
--- a/metadata/md5-cache/acct-group/artifactory-0
+++ b/metadata/md5-cache/acct-group/artifactory-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8528369a43ab0510ce7d2fc1cd77d832
diff --git a/metadata/md5-cache/acct-group/aspnet-0 b/metadata/md5-cache/acct-group/aspnet-0
index 4b8837eb5002..720bf2ab2ded 100644
--- a/metadata/md5-cache/acct-group/aspnet-0
+++ b/metadata/md5-cache/acct-group/aspnet-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=14616aad6d367a0192546bc8be927fc8
diff --git a/metadata/md5-cache/acct-group/asterisk-0-r1 b/metadata/md5-cache/acct-group/asterisk-0-r1
index fc08f430f205..7b22118d3b08 100644
--- a/metadata/md5-cache/acct-group/asterisk-0-r1
+++ b/metadata/md5-cache/acct-group/asterisk-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e954f273914a4ec40261f625add6d226
diff --git a/metadata/md5-cache/acct-group/at-0 b/metadata/md5-cache/acct-group/at-0
index c720572abb1a..374701279ebe 100644
--- a/metadata/md5-cache/acct-group/at-0
+++ b/metadata/md5-cache/acct-group/at-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6c23587cea818c9c29fa00aca3ffa7cc
diff --git a/metadata/md5-cache/acct-group/atheme-services-0-r1 b/metadata/md5-cache/acct-group/atheme-services-0-r1
index c417cf3e60ac..e5c5cfd07aba 100644
--- a/metadata/md5-cache/acct-group/atheme-services-0-r1
+++ b/metadata/md5-cache/acct-group/atheme-services-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8a1c3b6be0ce737ea538fa9b67308069
diff --git a/metadata/md5-cache/acct-group/audio-0-r1 b/metadata/md5-cache/acct-group/audio-0-r1
index 4c9322abd946..3cb05473b278 100644
--- a/metadata/md5-cache/acct-group/audio-0-r1
+++ b/metadata/md5-cache/acct-group/audio-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3e8495e7dda7e82fb24d3085b5d5b043
diff --git a/metadata/md5-cache/acct-group/automatic-0 b/metadata/md5-cache/acct-group/automatic-0
index 70a34f85ecbb..c6af05feb064 100644
--- a/metadata/md5-cache/acct-group/automatic-0
+++ b/metadata/md5-cache/acct-group/automatic-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0d901dcf07bf1d30026c2725cda223dd
diff --git a/metadata/md5-cache/acct-group/automx2-0-r1 b/metadata/md5-cache/acct-group/automx2-0-r1
index fe3724b272f8..0e4d65160d9b 100644
--- a/metadata/md5-cache/acct-group/automx2-0-r1
+++ b/metadata/md5-cache/acct-group/automx2-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5a803addb55ed971114916d64f9fcda0
diff --git a/metadata/md5-cache/acct-group/avahi-0-r1 b/metadata/md5-cache/acct-group/avahi-0-r1
index df9a7e48afa7..19979b7cb928 100644
--- a/metadata/md5-cache/acct-group/avahi-0-r1
+++ b/metadata/md5-cache/acct-group/avahi-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9d663044ca758ad7cdeb5e5f81cb0656
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0-r1 b/metadata/md5-cache/acct-group/avahi-autoipd-0-r1
index 80d0ecf259f1..4897c33e9c79 100644
--- a/metadata/md5-cache/acct-group/avahi-autoipd-0-r1
+++ b/metadata/md5-cache/acct-group/avahi-autoipd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=78d96081c13dac159d4fa4d0cebd5c31
diff --git a/metadata/md5-cache/acct-group/axtls-0 b/metadata/md5-cache/acct-group/axtls-0
index 393b25c470e9..2c158f36722e 100644
--- a/metadata/md5-cache/acct-group/axtls-0
+++ b/metadata/md5-cache/acct-group/axtls-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc367e60f51dd7e43359750bec5c5d04
diff --git a/metadata/md5-cache/acct-group/backuppc-0 b/metadata/md5-cache/acct-group/backuppc-0
index a3f402d6775c..c2dbccbbcba8 100644
--- a/metadata/md5-cache/acct-group/backuppc-0
+++ b/metadata/md5-cache/acct-group/backuppc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1b420974b69da3f560d9900dec5b049a
diff --git a/metadata/md5-cache/acct-group/bacula-0-r1 b/metadata/md5-cache/acct-group/bacula-0-r1
index 5e81d4b135c0..bc2d9e6917ec 100644
--- a/metadata/md5-cache/acct-group/bacula-0-r1
+++ b/metadata/md5-cache/acct-group/bacula-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=26d34f08d4cf0aaea79e4148f729aea9
diff --git a/metadata/md5-cache/acct-group/bareos-0-r1 b/metadata/md5-cache/acct-group/bareos-0-r1
index 9cd8c2592d11..c1645fee15d3 100644
--- a/metadata/md5-cache/acct-group/bareos-0-r1
+++ b/metadata/md5-cache/acct-group/bareos-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=36f81d9e21dbde16f4ac0c2e79d4f3f1
diff --git a/metadata/md5-cache/acct-group/beanstalk-0 b/metadata/md5-cache/acct-group/beanstalk-0
index e4f9230e9ca3..f15e6e776456 100644
--- a/metadata/md5-cache/acct-group/beanstalk-0
+++ b/metadata/md5-cache/acct-group/beanstalk-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=20575dd90ceb0ec27c5a4b641c2c144c
diff --git a/metadata/md5-cache/acct-group/bedrock-0-r1 b/metadata/md5-cache/acct-group/bedrock-0-r1
index 6d811017931c..e197895c307b 100644
--- a/metadata/md5-cache/acct-group/bedrock-0-r1
+++ b/metadata/md5-cache/acct-group/bedrock-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7e32735adcfc57d4793a8b22854d83fd
diff --git a/metadata/md5-cache/acct-group/biboumi-0 b/metadata/md5-cache/acct-group/biboumi-0
index ff26b7a1be61..3e6b1c20ed81 100644
--- a/metadata/md5-cache/acct-group/biboumi-0
+++ b/metadata/md5-cache/acct-group/biboumi-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=381735805a05e15fa0b0f9f97c78f40a
diff --git a/metadata/md5-cache/acct-group/bind_exporter-0-r1 b/metadata/md5-cache/acct-group/bind_exporter-0-r1
index 27ad20434194..7af2bdd81e79 100644
--- a/metadata/md5-cache/acct-group/bind_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/bind_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e4b6cc2baa05f53ef217049c873677c
diff --git a/metadata/md5-cache/acct-group/bird-0 b/metadata/md5-cache/acct-group/bird-0
index 09db78624add..6f77b4ecfd77 100644
--- a/metadata/md5-cache/acct-group/bird-0
+++ b/metadata/md5-cache/acct-group/bird-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5a7485a97cb891ab36b8e76172d866db
diff --git a/metadata/md5-cache/acct-group/bitcoin-0-r1 b/metadata/md5-cache/acct-group/bitcoin-0-r1
index f38a30b9166d..148434914e2a 100644
--- a/metadata/md5-cache/acct-group/bitcoin-0-r1
+++ b/metadata/md5-cache/acct-group/bitcoin-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=88eb29593f02d3f148cb9595415b4861
diff --git a/metadata/md5-cache/acct-group/bitflu-0 b/metadata/md5-cache/acct-group/bitflu-0
index a43ca2161d32..a540cedeb739 100644
--- a/metadata/md5-cache/acct-group/bitflu-0
+++ b/metadata/md5-cache/acct-group/bitflu-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8cf2ae9469d7240140821a3bc9b55726
diff --git a/metadata/md5-cache/acct-group/bitlbee-0-r1 b/metadata/md5-cache/acct-group/bitlbee-0-r1
index 4706aa4e45fb..6b4b56dbea90 100644
--- a/metadata/md5-cache/acct-group/bitlbee-0-r1
+++ b/metadata/md5-cache/acct-group/bitlbee-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=73f06d421342719fef4843bc1e48bc8d
diff --git a/metadata/md5-cache/acct-group/blackbox_exporter-0 b/metadata/md5-cache/acct-group/blackbox_exporter-0
index 835f3f4213ff..9a976a514f98 100644
--- a/metadata/md5-cache/acct-group/blackbox_exporter-0
+++ b/metadata/md5-cache/acct-group/blackbox_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=05b6b3e7c88e76ceb1044e6e80da2c24
diff --git a/metadata/md5-cache/acct-group/boinc-0 b/metadata/md5-cache/acct-group/boinc-0
index 82a69280d8db..9a1e3c6d5f60 100644
--- a/metadata/md5-cache/acct-group/boinc-0
+++ b/metadata/md5-cache/acct-group/boinc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cabe626fd2ba8bff5d1b81d2bdd0a196
diff --git a/metadata/md5-cache/acct-group/brlapi-0 b/metadata/md5-cache/acct-group/brlapi-0
index fddc196f1929..b79cd23042e9 100644
--- a/metadata/md5-cache/acct-group/brlapi-0
+++ b/metadata/md5-cache/acct-group/brlapi-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=67c9bf699565b8da9c9cc4a417ae3e77
diff --git a/metadata/md5-cache/acct-group/brltty-0 b/metadata/md5-cache/acct-group/brltty-0
index 027332548eb5..d6b37ffd3111 100644
--- a/metadata/md5-cache/acct-group/brltty-0
+++ b/metadata/md5-cache/acct-group/brltty-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5865cbfb98fe3ec124c67c930538c13b
diff --git a/metadata/md5-cache/acct-group/buildbot-0-r1 b/metadata/md5-cache/acct-group/buildbot-0-r1
index 80eeb796c6e8..797ce956900f 100644
--- a/metadata/md5-cache/acct-group/buildbot-0-r1
+++ b/metadata/md5-cache/acct-group/buildbot-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=89a1f7b2c007a52657e285e313072c3a
diff --git a/metadata/md5-cache/acct-group/bumblebee-0 b/metadata/md5-cache/acct-group/bumblebee-0
index 2f7b0c9ab4b0..30fd53ac731a 100644
--- a/metadata/md5-cache/acct-group/bumblebee-0
+++ b/metadata/md5-cache/acct-group/bumblebee-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6c376a27237d79604a3d8b4ced56a869
diff --git a/metadata/md5-cache/acct-group/burp-0-r1 b/metadata/md5-cache/acct-group/burp-0-r1
index c5c4fa0c6fff..82ecd6f427f1 100644
--- a/metadata/md5-cache/acct-group/burp-0-r1
+++ b/metadata/md5-cache/acct-group/burp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b3d665979d05f87af43921c0c12bb0a0
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0-r1 b/metadata/md5-cache/acct-group/burrow_exporter-0-r1
index 632a3c7ee2d4..b6ddc27acc5a 100644
--- a/metadata/md5-cache/acct-group/burrow_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/burrow_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f38e73b043d16c0855a5660ea1c72ee
diff --git a/metadata/md5-cache/acct-group/cadvisor-0-r1 b/metadata/md5-cache/acct-group/cadvisor-0-r1
index 3045035ec692..f86031ca3ec2 100644
--- a/metadata/md5-cache/acct-group/cadvisor-0-r1
+++ b/metadata/md5-cache/acct-group/cadvisor-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=750f0ef60b2b2f507bc44e1a81a663ac
diff --git a/metadata/md5-cache/acct-group/cancd-0 b/metadata/md5-cache/acct-group/cancd-0
index 48ef841e867d..f3859108056d 100644
--- a/metadata/md5-cache/acct-group/cancd-0
+++ b/metadata/md5-cache/acct-group/cancd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9869990ea0c90548cbd1f635c0031c55
diff --git a/metadata/md5-cache/acct-group/carbon-0-r1 b/metadata/md5-cache/acct-group/carbon-0-r1
index a846ef422ad3..e21860a78894 100644
--- a/metadata/md5-cache/acct-group/carbon-0-r1
+++ b/metadata/md5-cache/acct-group/carbon-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=349e522ff3a3f29496a3170475df3bdf
diff --git a/metadata/md5-cache/acct-group/cdrom-0-r1 b/metadata/md5-cache/acct-group/cdrom-0-r1
index 7f3b888b58c1..fa056ac40099 100644
--- a/metadata/md5-cache/acct-group/cdrom-0-r1
+++ b/metadata/md5-cache/acct-group/cdrom-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6220758de6cdd6054db6004a785f19aa
diff --git a/metadata/md5-cache/acct-group/ceph-0-r1 b/metadata/md5-cache/acct-group/ceph-0-r1
index 1cdc1e9fad16..fba7653b700f 100644
--- a/metadata/md5-cache/acct-group/ceph-0-r1
+++ b/metadata/md5-cache/acct-group/ceph-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=890b80077af994c9b8619d237b07e449
diff --git a/metadata/md5-cache/acct-group/cgit-0 b/metadata/md5-cache/acct-group/cgit-0
index cff1d18f863e..49d8959f9aab 100644
--- a/metadata/md5-cache/acct-group/cgit-0
+++ b/metadata/md5-cache/acct-group/cgit-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d88ca4ae79125394ef44fdee07423a37
diff --git a/metadata/md5-cache/acct-group/chronograf-0-r1 b/metadata/md5-cache/acct-group/chronograf-0-r1
index 6da7cda37734..91ebd6af2cd2 100644
--- a/metadata/md5-cache/acct-group/chronograf-0-r1
+++ b/metadata/md5-cache/acct-group/chronograf-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d345b47bed52dbfd657e31ec0b813dd3
diff --git a/metadata/md5-cache/acct-group/cinder-0-r1 b/metadata/md5-cache/acct-group/cinder-0-r1
index 211d3a86bac9..8f827f7907a6 100644
--- a/metadata/md5-cache/acct-group/cinder-0-r1
+++ b/metadata/md5-cache/acct-group/cinder-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2338b3f3fc4f4d39a2d711be9d060968
diff --git a/metadata/md5-cache/acct-group/clair-0-r1 b/metadata/md5-cache/acct-group/clair-0-r1
index d379ab8c7dd3..7f6610e283f3 100644
--- a/metadata/md5-cache/acct-group/clair-0-r1
+++ b/metadata/md5-cache/acct-group/clair-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=18eb3a4cd3705972e71a504dede58b25
diff --git a/metadata/md5-cache/acct-group/clamav-0-r1 b/metadata/md5-cache/acct-group/clamav-0-r1
index 8c01a26350a8..79697da851dc 100644
--- a/metadata/md5-cache/acct-group/clamav-0-r1
+++ b/metadata/md5-cache/acct-group/clamav-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=807db74c7e2a1423cbb6d42275fc080f
diff --git a/metadata/md5-cache/acct-group/cmd5checkpw-0-r1 b/metadata/md5-cache/acct-group/cmd5checkpw-0-r1
index 66c84e14a6d7..7aa894f19d72 100644
--- a/metadata/md5-cache/acct-group/cmd5checkpw-0-r1
+++ b/metadata/md5-cache/acct-group/cmd5checkpw-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=647267b4ef545e9ca83b2605313d1a38
diff --git a/metadata/md5-cache/acct-group/cntlm-0 b/metadata/md5-cache/acct-group/cntlm-0
index 36b45234ecdb..f6c9b154ad78 100644
--- a/metadata/md5-cache/acct-group/cntlm-0
+++ b/metadata/md5-cache/acct-group/cntlm-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2772cddbf81c5dce688bf854b7ff8a68
diff --git a/metadata/md5-cache/acct-group/cockroach-0 b/metadata/md5-cache/acct-group/cockroach-0
index d2f5e154a4b9..8f100a24009f 100644
--- a/metadata/md5-cache/acct-group/cockroach-0
+++ b/metadata/md5-cache/acct-group/cockroach-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=66f7da19c3d7d8a55f6ce74acd14d344
diff --git a/metadata/md5-cache/acct-group/collectd-0 b/metadata/md5-cache/acct-group/collectd-0
index 6aa0f34c4672..d9786514c02b 100644
--- a/metadata/md5-cache/acct-group/collectd-0
+++ b/metadata/md5-cache/acct-group/collectd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9e75d550395daa5d6d9eb36a7a9cf7cf
diff --git a/metadata/md5-cache/acct-group/colord-0 b/metadata/md5-cache/acct-group/colord-0
index 1fef1b592fe3..a9cf0d379048 100644
--- a/metadata/md5-cache/acct-group/colord-0
+++ b/metadata/md5-cache/acct-group/colord-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=12f66a38716e6f01c85b3baf6c08c98e
diff --git a/metadata/md5-cache/acct-group/consul-0-r1 b/metadata/md5-cache/acct-group/consul-0-r1
index 3b55601cbd53..85243c658466 100644
--- a/metadata/md5-cache/acct-group/consul-0-r1
+++ b/metadata/md5-cache/acct-group/consul-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d603223a86500d48eaa2d9add139b8a6
diff --git a/metadata/md5-cache/acct-group/consul-template-0-r1 b/metadata/md5-cache/acct-group/consul-template-0-r1
index da94fe7d37b4..4dad4af4e786 100644
--- a/metadata/md5-cache/acct-group/consul-template-0-r1
+++ b/metadata/md5-cache/acct-group/consul-template-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d0bfdf68e36e30aa948b2c8ec45a594f
diff --git a/metadata/md5-cache/acct-group/consul_exporter-0 b/metadata/md5-cache/acct-group/consul_exporter-0
index 9185a9da220d..392490493d23 100644
--- a/metadata/md5-cache/acct-group/consul_exporter-0
+++ b/metadata/md5-cache/acct-group/consul_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6ec52e834314e25eaa92a0031ab8d6d2
diff --git a/metadata/md5-cache/acct-group/coredns-0 b/metadata/md5-cache/acct-group/coredns-0
index 6b53978570e6..5e7f95abeff6 100644
--- a/metadata/md5-cache/acct-group/coredns-0
+++ b/metadata/md5-cache/acct-group/coredns-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5628c01e24ff1c3b49c3a4960e2c62f1
diff --git a/metadata/md5-cache/acct-group/croc-0 b/metadata/md5-cache/acct-group/croc-0
index 40717771c764..6f582bc992b6 100644
--- a/metadata/md5-cache/acct-group/croc-0
+++ b/metadata/md5-cache/acct-group/croc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=75ec8a152e4ecc373422e51f32444c4a
diff --git a/metadata/md5-cache/acct-group/cron-0 b/metadata/md5-cache/acct-group/cron-0
index 27879a61d5a7..4dcc1196d809 100644
--- a/metadata/md5-cache/acct-group/cron-0
+++ b/metadata/md5-cache/acct-group/cron-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f95ae7fb5167a41e3c0c48f91bb639e6
diff --git a/metadata/md5-cache/acct-group/crontab-0 b/metadata/md5-cache/acct-group/crontab-0
index 37955fb41b6a..07f4cd33091d 100644
--- a/metadata/md5-cache/acct-group/crontab-0
+++ b/metadata/md5-cache/acct-group/crontab-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1ef5b4bc73f94bf6a0164e8d5de6a482
diff --git a/metadata/md5-cache/acct-group/cvmfs-0-r1 b/metadata/md5-cache/acct-group/cvmfs-0-r1
index 53303b7cba6e..a7e1fcabae04 100644
--- a/metadata/md5-cache/acct-group/cvmfs-0-r1
+++ b/metadata/md5-cache/acct-group/cvmfs-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bce6a558bee7690a1e94911659342e53
diff --git a/metadata/md5-cache/acct-group/davfs2-0-r1 b/metadata/md5-cache/acct-group/davfs2-0-r1
index 45d086479a16..5f5d16810def 100644
--- a/metadata/md5-cache/acct-group/davfs2-0-r1
+++ b/metadata/md5-cache/acct-group/davfs2-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=811977e983d56622e3535a9f8d6d305e
diff --git a/metadata/md5-cache/acct-group/dbmail-0 b/metadata/md5-cache/acct-group/dbmail-0
index 6ce06f4c640c..41a5c4f8c57c 100644
--- a/metadata/md5-cache/acct-group/dbmail-0
+++ b/metadata/md5-cache/acct-group/dbmail-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=771919234afef283afb35d1c1ee7cbfc
diff --git a/metadata/md5-cache/acct-group/dbskkd-0 b/metadata/md5-cache/acct-group/dbskkd-0
index d0ee6db6344a..c28d247f7253 100644
--- a/metadata/md5-cache/acct-group/dbskkd-0
+++ b/metadata/md5-cache/acct-group/dbskkd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8a89ed1add86532209d1fd7e45ad43ab
diff --git a/metadata/md5-cache/acct-group/ddclient-0-r1 b/metadata/md5-cache/acct-group/ddclient-0-r1
index 4c38e276b3b0..cc6aea9034a2 100644
--- a/metadata/md5-cache/acct-group/ddclient-0-r1
+++ b/metadata/md5-cache/acct-group/ddclient-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e4f6e3941247b90e31d7cd75df414db0
diff --git a/metadata/md5-cache/acct-group/defang-0 b/metadata/md5-cache/acct-group/defang-0
index 47b86c4d64b3..21c7abbe77b3 100644
--- a/metadata/md5-cache/acct-group/defang-0
+++ b/metadata/md5-cache/acct-group/defang-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ae1a5144285da33843bd64bdf424c7ec
diff --git a/metadata/md5-cache/acct-group/dehydrated-0 b/metadata/md5-cache/acct-group/dehydrated-0
index fd728465e71d..3052428cc3ac 100644
--- a/metadata/md5-cache/acct-group/dehydrated-0
+++ b/metadata/md5-cache/acct-group/dehydrated-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fbaad4b6e256150c506ccdee335e1a6d
diff --git a/metadata/md5-cache/acct-group/deluge-0-r1 b/metadata/md5-cache/acct-group/deluge-0-r1
index a3427cd4effe..8d5ade3d22f4 100644
--- a/metadata/md5-cache/acct-group/deluge-0-r1
+++ b/metadata/md5-cache/acct-group/deluge-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2001752d03bb45056f58635d95c340ad
diff --git a/metadata/md5-cache/acct-group/dhcp-0-r1 b/metadata/md5-cache/acct-group/dhcp-0-r1
index c6bd860187b8..36e6694bb497 100644
--- a/metadata/md5-cache/acct-group/dhcp-0-r1
+++ b/metadata/md5-cache/acct-group/dhcp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a5b3357b396326f7db8c294bb55251fe
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0-r1 b/metadata/md5-cache/acct-group/dhcpcd-0-r1
index a46959ce71b5..b5daf4856073 100644
--- a/metadata/md5-cache/acct-group/dhcpcd-0-r1
+++ b/metadata/md5-cache/acct-group/dhcpcd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fa6ae70fc5fe03b606309c3bc9bd6562
diff --git a/metadata/md5-cache/acct-group/dialout-0-r1 b/metadata/md5-cache/acct-group/dialout-0-r1
index 2fdb563800df..acbcd94c7418 100644
--- a/metadata/md5-cache/acct-group/dialout-0-r1
+++ b/metadata/md5-cache/acct-group/dialout-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=91d0f007ab5cd5fbc52b3563502b37f2
diff --git a/metadata/md5-cache/acct-group/dictd-0 b/metadata/md5-cache/acct-group/dictd-0
index 51c302b0644a..d8c2c9d8c9ff 100644
--- a/metadata/md5-cache/acct-group/dictd-0
+++ b/metadata/md5-cache/acct-group/dictd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b9f1e7b77ab2a45d8c382c887ca944ab
diff --git a/metadata/md5-cache/acct-group/dirsrv-0 b/metadata/md5-cache/acct-group/dirsrv-0
index b2c3ce0e07f2..ff08cf7ddb36 100644
--- a/metadata/md5-cache/acct-group/dirsrv-0
+++ b/metadata/md5-cache/acct-group/dirsrv-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5a8b0c65e8f3f088fed0760c0ba1e2af
diff --git a/metadata/md5-cache/acct-group/disk-0-r1 b/metadata/md5-cache/acct-group/disk-0-r1
index 517176f86e2e..b0805c08d0c2 100644
--- a/metadata/md5-cache/acct-group/disk-0-r1
+++ b/metadata/md5-cache/acct-group/disk-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=86dc41cb27e6be3cdbb56143bf74d9a5
diff --git a/metadata/md5-cache/acct-group/distcc-1 b/metadata/md5-cache/acct-group/distcc-1
index 520fa1a8ad9a..cc9847390d5b 100644
--- a/metadata/md5-cache/acct-group/distcc-1
+++ b/metadata/md5-cache/acct-group/distcc-1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b290c37d629af2aaea9afbd7a173ce31
diff --git a/metadata/md5-cache/acct-group/dnrd-0 b/metadata/md5-cache/acct-group/dnrd-0
index 12349ec1deb6..1ce173c641d0 100644
--- a/metadata/md5-cache/acct-group/dnrd-0
+++ b/metadata/md5-cache/acct-group/dnrd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8d3037d118569e8f8ec0b8d48b0d4b59
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
index 3b0f6afa7934..07adaee03fe6 100644
--- a/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
+++ b/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2ca81421da5a3c70ffb18fd7b9657b0a
diff --git a/metadata/md5-cache/acct-group/dnsdist-0-r1 b/metadata/md5-cache/acct-group/dnsdist-0-r1
index 18fc7291843b..91ff6cb9a6f4 100644
--- a/metadata/md5-cache/acct-group/dnsdist-0-r1
+++ b/metadata/md5-cache/acct-group/dnsdist-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9b5f87951fed3009dede49c11b9afa06
diff --git a/metadata/md5-cache/acct-group/dnsmasq-0-r1 b/metadata/md5-cache/acct-group/dnsmasq-0-r1
index 0ad7a19c82a7..107a7014cd33 100644
--- a/metadata/md5-cache/acct-group/dnsmasq-0-r1
+++ b/metadata/md5-cache/acct-group/dnsmasq-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3dbed6f9131ae130ec29f1dbdc4a2325
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
index 0feea5a12cf4..9a7b5da2908d 100644
--- a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0271923fcfdba20422b2ba85d6f5506f
diff --git a/metadata/md5-cache/acct-group/docker-0-r1 b/metadata/md5-cache/acct-group/docker-0-r1
index ad7c0681655b..97261c1b1ce0 100644
--- a/metadata/md5-cache/acct-group/docker-0-r1
+++ b/metadata/md5-cache/acct-group/docker-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b75dd269af84d92273d7d2d9283739ca
diff --git a/metadata/md5-cache/acct-group/docker_auth-0-r1 b/metadata/md5-cache/acct-group/docker_auth-0-r1
index 16759de4df9c..52545f5f5958 100644
--- a/metadata/md5-cache/acct-group/docker_auth-0-r1
+++ b/metadata/md5-cache/acct-group/docker_auth-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cf70a18b0e53b52c356857b13d9b925d
diff --git a/metadata/md5-cache/acct-group/dovecot-0-r1 b/metadata/md5-cache/acct-group/dovecot-0-r1
index 18050477aff6..576572bbcc9f 100644
--- a/metadata/md5-cache/acct-group/dovecot-0-r1
+++ b/metadata/md5-cache/acct-group/dovecot-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5fbfce20e124f01e8429ba597de5b4c6
diff --git a/metadata/md5-cache/acct-group/dovenull-0-r1 b/metadata/md5-cache/acct-group/dovenull-0-r1
index 2620b89a1333..efbd6cf30ff5 100644
--- a/metadata/md5-cache/acct-group/dovenull-0-r1
+++ b/metadata/md5-cache/acct-group/dovenull-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=846ac2683d3afe4409661ea229a84f08
diff --git a/metadata/md5-cache/acct-group/drone-0 b/metadata/md5-cache/acct-group/drone-0
index 9adf9163a39d..a5dad27f81c7 100644
--- a/metadata/md5-cache/acct-group/drone-0
+++ b/metadata/md5-cache/acct-group/drone-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=553bbe639516091a183834334745a759
diff --git a/metadata/md5-cache/acct-group/ejabberd-0 b/metadata/md5-cache/acct-group/ejabberd-0
index 6f479704e550..a68492d5f9cc 100644
--- a/metadata/md5-cache/acct-group/ejabberd-0
+++ b/metadata/md5-cache/acct-group/ejabberd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a74c1cc972d6fa63e975e87bb3bca3b1
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0-r1 b/metadata/md5-cache/acct-group/elasticsearch-0-r1
index be613bec77f4..08bf1cd7cdf6 100644
--- a/metadata/md5-cache/acct-group/elasticsearch-0-r1
+++ b/metadata/md5-cache/acct-group/elasticsearch-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f29bd724440d9fbe6c464f6ec3ba5cb4
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
index deabbeb5dde6..17127e0f6b89 100644
--- a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4f358f88d206da44816419a86bad0d69
diff --git a/metadata/md5-cache/acct-group/energi3-0 b/metadata/md5-cache/acct-group/energi3-0
index c12d93ce9b49..1fdb1d0428df 100644
--- a/metadata/md5-cache/acct-group/energi3-0
+++ b/metadata/md5-cache/acct-group/energi3-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=51174f8843252fc5de4ec4d22e193a42
diff --git a/metadata/md5-cache/acct-group/epam-0 b/metadata/md5-cache/acct-group/epam-0
index d09a5fa53d14..498dc5ec72b6 100644
--- a/metadata/md5-cache/acct-group/epam-0
+++ b/metadata/md5-cache/acct-group/epam-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8d08069d3b94f08ee762f17c556a0c09
diff --git a/metadata/md5-cache/acct-group/epmd-0-r1 b/metadata/md5-cache/acct-group/epmd-0-r1
index abb735a01de8..c6f407bb696e 100644
--- a/metadata/md5-cache/acct-group/epmd-0-r1
+++ b/metadata/md5-cache/acct-group/epmd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=acee9cc45e6028f6f2282dfe0495b399
diff --git a/metadata/md5-cache/acct-group/err-0 b/metadata/md5-cache/acct-group/err-0
index edf5a24e0044..0407c6d7692d 100644
--- a/metadata/md5-cache/acct-group/err-0
+++ b/metadata/md5-cache/acct-group/err-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=517da6642af981d3558123965d951361
diff --git a/metadata/md5-cache/acct-group/etcd-0-r1 b/metadata/md5-cache/acct-group/etcd-0-r1
index 9a6275cace8e..0d6e3e675b55 100644
--- a/metadata/md5-cache/acct-group/etcd-0-r1
+++ b/metadata/md5-cache/acct-group/etcd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9dc58fa3f1fab0565d4484ab99cbe077
diff --git a/metadata/md5-cache/acct-group/exabgp-0-r1 b/metadata/md5-cache/acct-group/exabgp-0-r1
index d8bbe7747407..f6a61daa0a06 100644
--- a/metadata/md5-cache/acct-group/exabgp-0-r1
+++ b/metadata/md5-cache/acct-group/exabgp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=850344c1a43424d64391078e0354bce5
diff --git a/metadata/md5-cache/acct-group/ez-ipupd-0 b/metadata/md5-cache/acct-group/ez-ipupd-0
index 46bd754375a8..b9dbd65c1e91 100644
--- a/metadata/md5-cache/acct-group/ez-ipupd-0
+++ b/metadata/md5-cache/acct-group/ez-ipupd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=60bb2f9985add58ca026b0dbeab6be3c
diff --git a/metadata/md5-cache/acct-group/fax-0 b/metadata/md5-cache/acct-group/fax-0
index 21d2dca683ba..9170de168b65 100644
--- a/metadata/md5-cache/acct-group/fax-0
+++ b/metadata/md5-cache/acct-group/fax-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=09e7160b529085eecf8b72c6b267e149
diff --git a/metadata/md5-cache/acct-group/fcron-0 b/metadata/md5-cache/acct-group/fcron-0
index 02001b4c8add..69dbc694f725 100644
--- a/metadata/md5-cache/acct-group/fcron-0
+++ b/metadata/md5-cache/acct-group/fcron-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ec67655d6dea6f914dfcde637d3ba0e6
diff --git a/metadata/md5-cache/acct-group/fdm-0 b/metadata/md5-cache/acct-group/fdm-0
index e40b51465b1a..f06ed77b4174 100644
--- a/metadata/md5-cache/acct-group/fdm-0
+++ b/metadata/md5-cache/acct-group/fdm-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=99e0cfaa738b27c706372abe51ecdcf1
diff --git a/metadata/md5-cache/acct-group/fetchmail-0-r1 b/metadata/md5-cache/acct-group/fetchmail-0-r1
index 71054105c35f..a44cf84b6fd6 100644
--- a/metadata/md5-cache/acct-group/fetchmail-0-r1
+++ b/metadata/md5-cache/acct-group/fetchmail-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d5b312fce59f915af4aa369fd0945164
diff --git a/metadata/md5-cache/acct-group/fhem-0-r1 b/metadata/md5-cache/acct-group/fhem-0-r1
index bf02f8708895..c7105e3a9621 100644
--- a/metadata/md5-cache/acct-group/fhem-0-r1
+++ b/metadata/md5-cache/acct-group/fhem-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a7e40b105a91c89edbb0d0225aa14cf2
diff --git a/metadata/md5-cache/acct-group/fingerprint-0-r1 b/metadata/md5-cache/acct-group/fingerprint-0-r1
index 085585be2ea9..a749873d6dfb 100644
--- a/metadata/md5-cache/acct-group/fingerprint-0-r1
+++ b/metadata/md5-cache/acct-group/fingerprint-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=939cca9ed9982dca7857097e6d5ac112
diff --git a/metadata/md5-cache/acct-group/firebird-0-r1 b/metadata/md5-cache/acct-group/firebird-0-r1
index 3ff4c9a8929c..b3c708f0321f 100644
--- a/metadata/md5-cache/acct-group/firebird-0-r1
+++ b/metadata/md5-cache/acct-group/firebird-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7f221147826311d75ff36c4dc74de053
diff --git a/metadata/md5-cache/acct-group/flatpak-0 b/metadata/md5-cache/acct-group/flatpak-0
index f7c713246249..52112930bd59 100644
--- a/metadata/md5-cache/acct-group/flatpak-0
+++ b/metadata/md5-cache/acct-group/flatpak-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cf2be1a449f901bab848355546b6e2b5
diff --git a/metadata/md5-cache/acct-group/flows-0 b/metadata/md5-cache/acct-group/flows-0
index 90669c04ca00..649079caa14c 100644
--- a/metadata/md5-cache/acct-group/flows-0
+++ b/metadata/md5-cache/acct-group/flows-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a7b52fac2ecc794d2f1b0b7f58e2a33a
diff --git a/metadata/md5-cache/acct-group/fluentd-0-r1 b/metadata/md5-cache/acct-group/fluentd-0-r1
index b6e41b90f939..0d3c50581a47 100644
--- a/metadata/md5-cache/acct-group/fluentd-0-r1
+++ b/metadata/md5-cache/acct-group/fluentd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a5bbed77400034fd6152e2d2c49ae971
diff --git a/metadata/md5-cache/acct-group/foldingathome-0 b/metadata/md5-cache/acct-group/foldingathome-0
index ad0d378f1e81..cdfa9506215e 100644
--- a/metadata/md5-cache/acct-group/foldingathome-0
+++ b/metadata/md5-cache/acct-group/foldingathome-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0cde01ea6a2d8c9cd2cf3f8a9a92f297
diff --git a/metadata/md5-cache/acct-group/fp-multiuser-0 b/metadata/md5-cache/acct-group/fp-multiuser-0
index fbca8a83390d..c3c2d78e173f 100644
--- a/metadata/md5-cache/acct-group/fp-multiuser-0
+++ b/metadata/md5-cache/acct-group/fp-multiuser-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8c7e868527d3788d71045d182be27978
diff --git a/metadata/md5-cache/acct-group/freenet-0 b/metadata/md5-cache/acct-group/freenet-0
index 35ee946a2042..b0a2a0c511da 100644
--- a/metadata/md5-cache/acct-group/freenet-0
+++ b/metadata/md5-cache/acct-group/freenet-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=46ce36e91d3c4724f7d76ad52edd4f96
diff --git a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0 b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
index 85ee4c06af0d..8087f838f0f2 100644
--- a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
+++ b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9ffc1669c5db5a0b2c2901ce3e963e1b
diff --git a/metadata/md5-cache/acct-group/frr-0 b/metadata/md5-cache/acct-group/frr-0
index b788f8620c6a..c0a5c86c6121 100644
--- a/metadata/md5-cache/acct-group/frr-0
+++ b/metadata/md5-cache/acct-group/frr-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=20db6fffbda0e0114cd7d6667fb65181
diff --git a/metadata/md5-cache/acct-group/ftp-0-r1 b/metadata/md5-cache/acct-group/ftp-0-r1
index 0d2eacc1a93e..8fef0d38d0fc 100644
--- a/metadata/md5-cache/acct-group/ftp-0-r1
+++ b/metadata/md5-cache/acct-group/ftp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ced04f4dd315cb827fcb511ba168056b
diff --git a/metadata/md5-cache/acct-group/ftpproxy-0 b/metadata/md5-cache/acct-group/ftpproxy-0
index 4dc2c1130641..a00d98fd8df4 100644
--- a/metadata/md5-cache/acct-group/ftpproxy-0
+++ b/metadata/md5-cache/acct-group/ftpproxy-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c77b01054d832043821546295429c048
diff --git a/metadata/md5-cache/acct-group/fvwm-crystal-0-r1 b/metadata/md5-cache/acct-group/fvwm-crystal-0-r1
index 2b61e12fb79c..118aeb96bb5b 100644
--- a/metadata/md5-cache/acct-group/fvwm-crystal-0-r1
+++ b/metadata/md5-cache/acct-group/fvwm-crystal-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e8a5fa55953eddb3efbba5bf55f1e845
diff --git a/metadata/md5-cache/acct-group/gamemode-0 b/metadata/md5-cache/acct-group/gamemode-0
index 422a7032dc8e..9c777bdf0ff9 100644
--- a/metadata/md5-cache/acct-group/gamemode-0
+++ b/metadata/md5-cache/acct-group/gamemode-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=03c55354ad54e3c695e008d64c05635d
diff --git a/metadata/md5-cache/acct-group/gamestat-0-r1 b/metadata/md5-cache/acct-group/gamestat-0-r1
index 5e9fb09e669d..8c4a3112c3d6 100644
--- a/metadata/md5-cache/acct-group/gamestat-0-r1
+++ b/metadata/md5-cache/acct-group/gamestat-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f044e9cc362103960e4c46cf0a80aa0e
diff --git a/metadata/md5-cache/acct-group/gatling-0-r1 b/metadata/md5-cache/acct-group/gatling-0-r1
index 684ff8b65f8f..da576db1a4d0 100644
--- a/metadata/md5-cache/acct-group/gatling-0-r1
+++ b/metadata/md5-cache/acct-group/gatling-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=426bac7a57d9ec5838785e2dca0b83a7
diff --git a/metadata/md5-cache/acct-group/gauth-0 b/metadata/md5-cache/acct-group/gauth-0
index 8c7503aa098e..4324cf4d90c8 100644
--- a/metadata/md5-cache/acct-group/gauth-0
+++ b/metadata/md5-cache/acct-group/gauth-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ec1021f72f47ec3bdc9138455b6f2ec4
diff --git a/metadata/md5-cache/acct-group/gdm-0 b/metadata/md5-cache/acct-group/gdm-0
index 5a821a0addcb..e5cf3bd78b7b 100644
--- a/metadata/md5-cache/acct-group/gdm-0
+++ b/metadata/md5-cache/acct-group/gdm-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b265403852518ffdd71c01004d7bbe04
diff --git a/metadata/md5-cache/acct-group/geneweb-0-r1 b/metadata/md5-cache/acct-group/geneweb-0-r1
index 5d4b92674cce..89da2ae1c8a3 100644
--- a/metadata/md5-cache/acct-group/geneweb-0-r1
+++ b/metadata/md5-cache/acct-group/geneweb-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0ff62b39946b85e801764fc1cf917c4e
diff --git a/metadata/md5-cache/acct-group/geoclue-0 b/metadata/md5-cache/acct-group/geoclue-0
index 408d6ba93a04..d6cd04613a27 100644
--- a/metadata/md5-cache/acct-group/geoclue-0
+++ b/metadata/md5-cache/acct-group/geoclue-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f558758b6f349e0cb527938f5472ee36
diff --git a/metadata/md5-cache/acct-group/gerbera-0-r1 b/metadata/md5-cache/acct-group/gerbera-0-r1
index e3c770b2f634..ad5dcc981e75 100644
--- a/metadata/md5-cache/acct-group/gerbera-0-r1
+++ b/metadata/md5-cache/acct-group/gerbera-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=05f5232d19adab18b26d0e4ce4996bfe
diff --git a/metadata/md5-cache/acct-group/git-0-r1 b/metadata/md5-cache/acct-group/git-0-r1
index 69850cbd4ef1..fefff64e82b9 100644
--- a/metadata/md5-cache/acct-group/git-0-r1
+++ b/metadata/md5-cache/acct-group/git-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5f17c3fbba725b49f8b6c9cd3c06a10a
diff --git a/metadata/md5-cache/acct-group/github-exporter-0 b/metadata/md5-cache/acct-group/github-exporter-0
index 3ad711b678dc..0851c77330f9 100644
--- a/metadata/md5-cache/acct-group/github-exporter-0
+++ b/metadata/md5-cache/acct-group/github-exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fc537f59a086c7091bab5f90266fed95
diff --git a/metadata/md5-cache/acct-group/gitlab-runner-1 b/metadata/md5-cache/acct-group/gitlab-runner-1
index b31a69e413c4..03eb175a6060 100644
--- a/metadata/md5-cache/acct-group/gitlab-runner-1
+++ b/metadata/md5-cache/acct-group/gitlab-runner-1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=880f22976d82695c846340ddd33213fb
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0-r1 b/metadata/md5-cache/acct-group/gkrellmd-0-r1
index e15495e9f0e8..eec89702898f 100644
--- a/metadata/md5-cache/acct-group/gkrellmd-0-r1
+++ b/metadata/md5-cache/acct-group/gkrellmd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=09269520b7221ea9e1a999e1354abec2
diff --git a/metadata/md5-cache/acct-group/glance-0-r1 b/metadata/md5-cache/acct-group/glance-0-r1
index 9e00e4adf5f5..3a17106fdf97 100644
--- a/metadata/md5-cache/acct-group/glance-0-r1
+++ b/metadata/md5-cache/acct-group/glance-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4e0e15ccf19bfcfc90e85892a50b4cfc
diff --git a/metadata/md5-cache/acct-group/gluster-0-r1 b/metadata/md5-cache/acct-group/gluster-0-r1
index 84c35b5e5987..aad7c864f882 100644
--- a/metadata/md5-cache/acct-group/gluster-0-r1
+++ b/metadata/md5-cache/acct-group/gluster-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a6c6402bc483383cd9ac937132c162f1
diff --git a/metadata/md5-cache/acct-group/gnump3d-0 b/metadata/md5-cache/acct-group/gnump3d-0
index 72b6a28712bb..155def58ae44 100644
--- a/metadata/md5-cache/acct-group/gnump3d-0
+++ b/metadata/md5-cache/acct-group/gnump3d-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7151feff902beba0223fbcd87b4cf0ba
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-0 b/metadata/md5-cache/acct-group/gnupg-pkcs11-0
index 20fa6c617330..2656bc9d1ee6 100644
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-0
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f330cbbd07cf391b6a1ba1385a1cf5a2
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0 b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
index d768e8782624..7fe2f34b2864 100644
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3b60d7d49c5e92bfaa55093ded95e39a
diff --git a/metadata/md5-cache/acct-group/gopher-0 b/metadata/md5-cache/acct-group/gopher-0
index 2abf5163dc1e..92f73b13b07e 100644
--- a/metadata/md5-cache/acct-group/gopher-0
+++ b/metadata/md5-cache/acct-group/gopher-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fd3a310352e8d4dad8c5e0455a63d788
diff --git a/metadata/md5-cache/acct-group/gopherd-0 b/metadata/md5-cache/acct-group/gopherd-0
index 397d7fec7871..88e776704f93 100644
--- a/metadata/md5-cache/acct-group/gopherd-0
+++ b/metadata/md5-cache/acct-group/gopherd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ce1c211c6ae847481daa3aa9519717a0
diff --git a/metadata/md5-cache/acct-group/gpib-0-r1 b/metadata/md5-cache/acct-group/gpib-0-r1
index b7e78c48ef7c..be2e10c783fd 100644
--- a/metadata/md5-cache/acct-group/gpib-0-r1
+++ b/metadata/md5-cache/acct-group/gpib-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0db80d994fc5708816861fcaea57821e
diff --git a/metadata/md5-cache/acct-group/gpio-0 b/metadata/md5-cache/acct-group/gpio-0
index b29c32830384..a6cf934509be 100644
--- a/metadata/md5-cache/acct-group/gpio-0
+++ b/metadata/md5-cache/acct-group/gpio-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=178e2bd158816bb5da8f691bc6a1e9aa
diff --git a/metadata/md5-cache/acct-group/grafana-0-r1 b/metadata/md5-cache/acct-group/grafana-0-r1
index 113d5588346b..51f648f47eda 100644
--- a/metadata/md5-cache/acct-group/grafana-0-r1
+++ b/metadata/md5-cache/acct-group/grafana-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d618b2da8969f2890ff2e5a89d74701f
diff --git a/metadata/md5-cache/acct-group/graylog-0-r1 b/metadata/md5-cache/acct-group/graylog-0-r1
index feb135d1cfa6..55b16d4cdfdb 100644
--- a/metadata/md5-cache/acct-group/graylog-0-r1
+++ b/metadata/md5-cache/acct-group/graylog-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=edd58827a17cc3bc7156c62f6741dc49
diff --git a/metadata/md5-cache/acct-group/greetd-0-r1 b/metadata/md5-cache/acct-group/greetd-0-r1
index e6f15d8a6fbb..79d5c11d294d 100644
--- a/metadata/md5-cache/acct-group/greetd-0-r1
+++ b/metadata/md5-cache/acct-group/greetd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=32e8e78600943845bc97efcbf3dbfe9f
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0 b/metadata/md5-cache/acct-group/grok_exporter-0
index 24f24647d306..57a79e9599e4 100644
--- a/metadata/md5-cache/acct-group/grok_exporter-0
+++ b/metadata/md5-cache/acct-group/grok_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=87baa22bef03e7a6173552e0b909d62f
diff --git a/metadata/md5-cache/acct-group/groonga-0 b/metadata/md5-cache/acct-group/groonga-0
index 2ab36246e3b1..b4c2b0c4a912 100644
--- a/metadata/md5-cache/acct-group/groonga-0
+++ b/metadata/md5-cache/acct-group/groonga-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f110cb7374f2f91ee73a4f08774a510e
diff --git a/metadata/md5-cache/acct-group/gvm-0-r1 b/metadata/md5-cache/acct-group/gvm-0-r1
index c24b2474f6d7..0dc2e80e6162 100644
--- a/metadata/md5-cache/acct-group/gvm-0-r1
+++ b/metadata/md5-cache/acct-group/gvm-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=711074e5d35992d5ff60a57597cd0a82
diff --git a/metadata/md5-cache/acct-group/h2o-0 b/metadata/md5-cache/acct-group/h2o-0
index 1fa09f9d8f8d..bf0acf011e8f 100644
--- a/metadata/md5-cache/acct-group/h2o-0
+++ b/metadata/md5-cache/acct-group/h2o-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4a84b01e2971202a92807c67a8eed975
diff --git a/metadata/md5-cache/acct-group/haclient-0 b/metadata/md5-cache/acct-group/haclient-0
index ffb12fcca80d..5ab03cf6306f 100644
--- a/metadata/md5-cache/acct-group/haclient-0
+++ b/metadata/md5-cache/acct-group/haclient-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e8c9006c8133f5547390297ee87ec4af
diff --git a/metadata/md5-cache/acct-group/haproxy-0-r1 b/metadata/md5-cache/acct-group/haproxy-0-r1
index 0943239ef6f1..b2107d1a7e49 100644
--- a/metadata/md5-cache/acct-group/haproxy-0-r1
+++ b/metadata/md5-cache/acct-group/haproxy-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ae4f37ea57a16efe675292ae95f1217a
diff --git a/metadata/md5-cache/acct-group/havp-0 b/metadata/md5-cache/acct-group/havp-0
index 41298b813a61..9d8d7acce890 100644
--- a/metadata/md5-cache/acct-group/havp-0
+++ b/metadata/md5-cache/acct-group/havp-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=44ba45ce1b50862cee36ac9f585d89bf
diff --git a/metadata/md5-cache/acct-group/headscale-0 b/metadata/md5-cache/acct-group/headscale-0
index 0acf4be0b2ad..c4ccab61962f 100644
--- a/metadata/md5-cache/acct-group/headscale-0
+++ b/metadata/md5-cache/acct-group/headscale-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8895ef50b91938766322b26376abf7a1
diff --git a/metadata/md5-cache/acct-group/heat-0-r1 b/metadata/md5-cache/acct-group/heat-0-r1
index cc3b75136c21..3ce4a541d91f 100644
--- a/metadata/md5-cache/acct-group/heat-0-r1
+++ b/metadata/md5-cache/acct-group/heat-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=33f81fce01773239f6d9362751ac6bd5
diff --git a/metadata/md5-cache/acct-group/hsqldb-0 b/metadata/md5-cache/acct-group/hsqldb-0
index 9dbb8a5c6bfc..8a2bed41892d 100644
--- a/metadata/md5-cache/acct-group/hsqldb-0
+++ b/metadata/md5-cache/acct-group/hsqldb-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a5c9cd370d0cf6d0f574d8b73f4e7870
diff --git a/metadata/md5-cache/acct-group/http-0 b/metadata/md5-cache/acct-group/http-0
index e9b173280f1e..c7066bdd8f34 100644
--- a/metadata/md5-cache/acct-group/http-0
+++ b/metadata/md5-cache/acct-group/http-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5bebfb2cc5cfcfc7d8306f27fe3bbf36
diff --git a/metadata/md5-cache/acct-group/i2c-0 b/metadata/md5-cache/acct-group/i2c-0
index e69e61bb129a..08b366cdfb74 100644
--- a/metadata/md5-cache/acct-group/i2c-0
+++ b/metadata/md5-cache/acct-group/i2c-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cb34b401160f16ecb0948083dc1b9549
diff --git a/metadata/md5-cache/acct-group/i2p-0-r1 b/metadata/md5-cache/acct-group/i2p-0-r1
index a9945b51882a..96e0979e4e21 100644
--- a/metadata/md5-cache/acct-group/i2p-0-r1
+++ b/metadata/md5-cache/acct-group/i2p-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=082252b9be81784908c88fa29d126850
diff --git a/metadata/md5-cache/acct-group/i2pd-0-r1 b/metadata/md5-cache/acct-group/i2pd-0-r1
index 7917657d4125..d60779f02778 100644
--- a/metadata/md5-cache/acct-group/i2pd-0-r1
+++ b/metadata/md5-cache/acct-group/i2pd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=43935f26a17b74de60674170e2104c33
diff --git a/metadata/md5-cache/acct-group/icecast-0 b/metadata/md5-cache/acct-group/icecast-0
index b7aa98eaa0b0..57197f0a1bbb 100644
--- a/metadata/md5-cache/acct-group/icecast-0
+++ b/metadata/md5-cache/acct-group/icecast-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=95cb7ebe9f2c38367630c8d2020a6653
diff --git a/metadata/md5-cache/acct-group/icecream-0 b/metadata/md5-cache/acct-group/icecream-0
index 5a39a6abd0db..be3dc0755146 100644
--- a/metadata/md5-cache/acct-group/icecream-0
+++ b/metadata/md5-cache/acct-group/icecream-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9ce1bdeb0490c71db009e4b8d05656aa
diff --git a/metadata/md5-cache/acct-group/ices-0 b/metadata/md5-cache/acct-group/ices-0
index f425dbeebd6d..80102e96e819 100644
--- a/metadata/md5-cache/acct-group/ices-0
+++ b/metadata/md5-cache/acct-group/ices-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6332ce88917781f8f66742e8b3818337
diff --git a/metadata/md5-cache/acct-group/icinga-0-r1 b/metadata/md5-cache/acct-group/icinga-0-r1
index 1e1375ec9206..87f8959bb32f 100644
--- a/metadata/md5-cache/acct-group/icinga-0-r1
+++ b/metadata/md5-cache/acct-group/icinga-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=614559440f7ec571540f4589ad9a0065
diff --git a/metadata/md5-cache/acct-group/icingacmd-0-r1 b/metadata/md5-cache/acct-group/icingacmd-0-r1
index 94d5121a3596..ba4e368d0c50 100644
--- a/metadata/md5-cache/acct-group/icingacmd-0-r1
+++ b/metadata/md5-cache/acct-group/icingacmd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f4595df7e944a279aa3ae2256e9b402b
diff --git a/metadata/md5-cache/acct-group/icingaweb2-0-r1 b/metadata/md5-cache/acct-group/icingaweb2-0-r1
index 12cd2b528481..8834a788bf6c 100644
--- a/metadata/md5-cache/acct-group/icingaweb2-0-r1
+++ b/metadata/md5-cache/acct-group/icingaweb2-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=31b96a6637e3db722b1a05e0b9fc5fcf
diff --git a/metadata/md5-cache/acct-group/influxdb-0-r1 b/metadata/md5-cache/acct-group/influxdb-0-r1
index 24a46831039a..a7c6752d30ff 100644
--- a/metadata/md5-cache/acct-group/influxdb-0-r1
+++ b/metadata/md5-cache/acct-group/influxdb-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2250aebd19871f52eeec6d23f8195974
diff --git a/metadata/md5-cache/acct-group/input-0-r1 b/metadata/md5-cache/acct-group/input-0-r1
index 71a383f8914b..7826c94e5b85 100644
--- a/metadata/md5-cache/acct-group/input-0-r1
+++ b/metadata/md5-cache/acct-group/input-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=98a31fab0bb705f662da004d6af750e4
diff --git a/metadata/md5-cache/acct-group/inspircd-0-r1 b/metadata/md5-cache/acct-group/inspircd-0-r1
index e5418b7be18a..4c203eba0e1f 100644
--- a/metadata/md5-cache/acct-group/inspircd-0-r1
+++ b/metadata/md5-cache/acct-group/inspircd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1f8614a826878f04dd8c252e4439197c
diff --git a/metadata/md5-cache/acct-group/ipfs-0-r1 b/metadata/md5-cache/acct-group/ipfs-0-r1
index 492c0806a5f5..1d37fb372673 100644
--- a/metadata/md5-cache/acct-group/ipfs-0-r1
+++ b/metadata/md5-cache/acct-group/ipfs-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cc3f334330dea843efa34b55869546ce
diff --git a/metadata/md5-cache/acct-group/ipsec-0 b/metadata/md5-cache/acct-group/ipsec-0
index 9f21716989e7..888b38d28f35 100644
--- a/metadata/md5-cache/acct-group/ipsec-0
+++ b/metadata/md5-cache/acct-group/ipsec-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cd946e2b23225795e12a1cc3cac334f7
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0 b/metadata/md5-cache/acct-group/ipsentinel-0
index c0dc71c8d11d..18211435d3be 100644
--- a/metadata/md5-cache/acct-group/ipsentinel-0
+++ b/metadata/md5-cache/acct-group/ipsentinel-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=aaaca4b3d345d2b4647e7f4bebebcbcc
diff --git a/metadata/md5-cache/acct-group/iroffer-0 b/metadata/md5-cache/acct-group/iroffer-0
index 02485ca22bbb..fd90747f3fe8 100644
--- a/metadata/md5-cache/acct-group/iroffer-0
+++ b/metadata/md5-cache/acct-group/iroffer-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4da5b0b99b99777b583ad6bd68bf9df8
diff --git a/metadata/md5-cache/acct-group/jabber-0 b/metadata/md5-cache/acct-group/jabber-0
index a02df1bce71e..4c8e8c1cc574 100644
--- a/metadata/md5-cache/acct-group/jabber-0
+++ b/metadata/md5-cache/acct-group/jabber-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=451f9db031d76450e9c11d81b333b660
diff --git a/metadata/md5-cache/acct-group/jenkins-0 b/metadata/md5-cache/acct-group/jenkins-0
index 3c2ac9238cf0..6aee5ef84248 100644
--- a/metadata/md5-cache/acct-group/jenkins-0
+++ b/metadata/md5-cache/acct-group/jenkins-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=24872d231394a6b99fb6ff274b556f3d
diff --git a/metadata/md5-cache/acct-group/kafka-0-r1 b/metadata/md5-cache/acct-group/kafka-0-r1
index e9650f642f21..97311be9434a 100644
--- a/metadata/md5-cache/acct-group/kafka-0-r1
+++ b/metadata/md5-cache/acct-group/kafka-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=27a680dabdce72e2686eb91ff806dc8d
diff --git a/metadata/md5-cache/acct-group/kapacitor-0-r1 b/metadata/md5-cache/acct-group/kapacitor-0-r1
index acc8c90a53e4..f11583e31013 100644
--- a/metadata/md5-cache/acct-group/kapacitor-0-r1
+++ b/metadata/md5-cache/acct-group/kapacitor-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9e4ad2122df3f8582ff442354e9f926e
diff --git a/metadata/md5-cache/acct-group/karma-0 b/metadata/md5-cache/acct-group/karma-0
index 8de8c211483c..c4bba25169c2 100644
--- a/metadata/md5-cache/acct-group/karma-0
+++ b/metadata/md5-cache/acct-group/karma-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=58fcc43bee645083bc6dd2f5f1bc071f
diff --git a/metadata/md5-cache/acct-group/keystone-0-r1 b/metadata/md5-cache/acct-group/keystone-0-r1
index fcb093cbb74c..93567852626d 100644
--- a/metadata/md5-cache/acct-group/keystone-0-r1
+++ b/metadata/md5-cache/acct-group/keystone-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3d0739f8634948fbc860e400bfcba344
diff --git a/metadata/md5-cache/acct-group/kibana-0-r1 b/metadata/md5-cache/acct-group/kibana-0-r1
index f4a4866798a2..5bd41b5c7a28 100644
--- a/metadata/md5-cache/acct-group/kibana-0-r1
+++ b/metadata/md5-cache/acct-group/kibana-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=947de83e05df1d1ee7382cab80c951b8
diff --git a/metadata/md5-cache/acct-group/kismet-0-r1 b/metadata/md5-cache/acct-group/kismet-0-r1
index ce0be924bcc1..7af9a58b0c6f 100644
--- a/metadata/md5-cache/acct-group/kismet-0-r1
+++ b/metadata/md5-cache/acct-group/kismet-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9ac5db94d7469f3ee73629f9afdf3804
diff --git a/metadata/md5-cache/acct-group/kmem-0-r1 b/metadata/md5-cache/acct-group/kmem-0-r1
index f5b07d3eeb1a..f72cdb91637e 100644
--- a/metadata/md5-cache/acct-group/kmem-0-r1
+++ b/metadata/md5-cache/acct-group/kmem-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fe0ca6a296e1cd2a7cc95b45e44992be
diff --git a/metadata/md5-cache/acct-group/knot-0-r1 b/metadata/md5-cache/acct-group/knot-0-r1
index c7b4753c7e57..8e090a70f671 100644
--- a/metadata/md5-cache/acct-group/knot-0-r1
+++ b/metadata/md5-cache/acct-group/knot-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e58cf9a4d5ec12dce8afbadafb67b0f9
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0-r1 b/metadata/md5-cache/acct-group/kube-apiserver-0-r1
index b0dee8126874..345dd3b15518 100644
--- a/metadata/md5-cache/acct-group/kube-apiserver-0-r1
+++ b/metadata/md5-cache/acct-group/kube-apiserver-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5053745b8e5ef4a0066b76470ec2b8a4
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0-r1 b/metadata/md5-cache/acct-group/kube-controller-manager-0-r1
index 1b58d0c96cdc..044066a924c1 100644
--- a/metadata/md5-cache/acct-group/kube-controller-manager-0-r1
+++ b/metadata/md5-cache/acct-group/kube-controller-manager-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=52dcd39d5feefe9d2d4f4e0352efefd5
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0-r1 b/metadata/md5-cache/acct-group/kube-scheduler-0-r1
index 84e95b791512..bcdfb1bb6018 100644
--- a/metadata/md5-cache/acct-group/kube-scheduler-0-r1
+++ b/metadata/md5-cache/acct-group/kube-scheduler-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=39b6ca5740588827ec6cecc56b9d735c
diff --git a/metadata/md5-cache/acct-group/kvm-0-r1 b/metadata/md5-cache/acct-group/kvm-0-r1
index ee40c630d9aa..83a32ba9bdb1 100644
--- a/metadata/md5-cache/acct-group/kvm-0-r1
+++ b/metadata/md5-cache/acct-group/kvm-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d9b2019c6ecdceed977a7c5d76312ea7
diff --git a/metadata/md5-cache/acct-group/ldap-0 b/metadata/md5-cache/acct-group/ldap-0
index d6f4e3237496..527bada563c6 100644
--- a/metadata/md5-cache/acct-group/ldap-0
+++ b/metadata/md5-cache/acct-group/ldap-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3db0dfd8fb9c52c5a6968da67d7f3924
diff --git a/metadata/md5-cache/acct-group/libreoffice-0 b/metadata/md5-cache/acct-group/libreoffice-0
index 44bfb9cbe553..7eda99d1fa64 100644
--- a/metadata/md5-cache/acct-group/libreoffice-0
+++ b/metadata/md5-cache/acct-group/libreoffice-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8f57d901c6cc37aeb6ebd41f158d12bd
diff --git a/metadata/md5-cache/acct-group/libvirt-0-r1 b/metadata/md5-cache/acct-group/libvirt-0-r1
index 9bc7cd82ba04..213acfd95c25 100644
--- a/metadata/md5-cache/acct-group/libvirt-0-r1
+++ b/metadata/md5-cache/acct-group/libvirt-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=87ae6216c43b59d90e9bee95240ccd37
diff --git a/metadata/md5-cache/acct-group/lightdm-0-r1 b/metadata/md5-cache/acct-group/lightdm-0-r1
index 08aeb67d07f2..973ebf907327 100644
--- a/metadata/md5-cache/acct-group/lightdm-0-r1
+++ b/metadata/md5-cache/acct-group/lightdm-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3079a45e510d5f347e6ccb491a7dadd9
diff --git a/metadata/md5-cache/acct-group/lighttpd-0-r1 b/metadata/md5-cache/acct-group/lighttpd-0-r1
index 9d72e599c45c..9b3fd7ae314f 100644
--- a/metadata/md5-cache/acct-group/lighttpd-0-r1
+++ b/metadata/md5-cache/acct-group/lighttpd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2be863cecef258cae52996a81bd9a452
diff --git a/metadata/md5-cache/acct-group/litecoin-0 b/metadata/md5-cache/acct-group/litecoin-0
index e71f43d6a5d7..3e4de6e3697e 100644
--- a/metadata/md5-cache/acct-group/litecoin-0
+++ b/metadata/md5-cache/acct-group/litecoin-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e976c6dff0bfe09905c9cc80af56bdca
diff --git a/metadata/md5-cache/acct-group/lldpd-0-r1 b/metadata/md5-cache/acct-group/lldpd-0-r1
index b5ed1187bbd8..911cfd61adf8 100644
--- a/metadata/md5-cache/acct-group/lldpd-0-r1
+++ b/metadata/md5-cache/acct-group/lldpd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=597a2ba74d68f241d224b78a433cddb4
diff --git a/metadata/md5-cache/acct-group/locate-0-r1 b/metadata/md5-cache/acct-group/locate-0-r1
index ff0d1768cad0..610ce0976d68 100644
--- a/metadata/md5-cache/acct-group/locate-0-r1
+++ b/metadata/md5-cache/acct-group/locate-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7c59c59581c0af4dc53bbcfc7c5ad9a8
diff --git a/metadata/md5-cache/acct-group/logcheck-0 b/metadata/md5-cache/acct-group/logcheck-0
index 07a60cdb8816..cad11f8395c5 100644
--- a/metadata/md5-cache/acct-group/logcheck-0
+++ b/metadata/md5-cache/acct-group/logcheck-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f47aabdfd659a4525e54b1af77eaa423
diff --git a/metadata/md5-cache/acct-group/logstash-0-r1 b/metadata/md5-cache/acct-group/logstash-0-r1
index 86a86f3f779d..ee03e0096917 100644
--- a/metadata/md5-cache/acct-group/logstash-0-r1
+++ b/metadata/md5-cache/acct-group/logstash-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6df1d6292c925bbc7262edcb56260ccd
diff --git a/metadata/md5-cache/acct-group/logsurfer-0 b/metadata/md5-cache/acct-group/logsurfer-0
index bac01a98e7f5..fd756ca2a854 100644
--- a/metadata/md5-cache/acct-group/logsurfer-0
+++ b/metadata/md5-cache/acct-group/logsurfer-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6e5eaa8bf1014673fdbd20e5cacffb6d
diff --git a/metadata/md5-cache/acct-group/lp-0-r1 b/metadata/md5-cache/acct-group/lp-0-r1
index 29a79487d47e..3309cf1e0ac3 100644
--- a/metadata/md5-cache/acct-group/lp-0-r1
+++ b/metadata/md5-cache/acct-group/lp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=34e277522a71e44dc5019512cda7a94d
diff --git a/metadata/md5-cache/acct-group/lpadmin-0-r1 b/metadata/md5-cache/acct-group/lpadmin-0-r1
index ba5448ed39f4..d2ad6fd16285 100644
--- a/metadata/md5-cache/acct-group/lpadmin-0-r1
+++ b/metadata/md5-cache/acct-group/lpadmin-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4092909cf907de72bd73ebdc4038d250
diff --git a/metadata/md5-cache/acct-group/lxc-0 b/metadata/md5-cache/acct-group/lxc-0
index 0bdd29549b40..a82d749a0d81 100644
--- a/metadata/md5-cache/acct-group/lxc-0
+++ b/metadata/md5-cache/acct-group/lxc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4cceec23bd9c933a0c70c008ab3759d9
diff --git a/metadata/md5-cache/acct-group/lxd-0-r1 b/metadata/md5-cache/acct-group/lxd-0-r1
index 499a6839eb87..08a824563b67 100644
--- a/metadata/md5-cache/acct-group/lxd-0-r1
+++ b/metadata/md5-cache/acct-group/lxd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4699ae360aed34e6b423ce9406061d0d
diff --git a/metadata/md5-cache/acct-group/mail-0-r1 b/metadata/md5-cache/acct-group/mail-0-r1
index 36ccaac58eae..482066c83f1c 100644
--- a/metadata/md5-cache/acct-group/mail-0-r1
+++ b/metadata/md5-cache/acct-group/mail-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=df7f2454a5da6ec40e392d95c58773f6
diff --git a/metadata/md5-cache/acct-group/man-0-r1 b/metadata/md5-cache/acct-group/man-0-r1
index 2a03792ee686..e1bf28c15ce2 100644
--- a/metadata/md5-cache/acct-group/man-0-r1
+++ b/metadata/md5-cache/acct-group/man-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bc3744ff4cff30e824fa7947a44e84cd
diff --git a/metadata/md5-cache/acct-group/maradns-0-r1 b/metadata/md5-cache/acct-group/maradns-0-r1
index a110930b8525..2cf48789b011 100644
--- a/metadata/md5-cache/acct-group/maradns-0-r1
+++ b/metadata/md5-cache/acct-group/maradns-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0b120d9ef47a9b58921447e145cfba83
diff --git a/metadata/md5-cache/acct-group/memcached-0-r1 b/metadata/md5-cache/acct-group/memcached-0-r1
index e2c1a14c27ee..d4929e131550 100644
--- a/metadata/md5-cache/acct-group/memcached-0-r1
+++ b/metadata/md5-cache/acct-group/memcached-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1e325a3cdfb3722fda6e3aaa83d6a162
diff --git a/metadata/md5-cache/acct-group/memcached_exporter-0 b/metadata/md5-cache/acct-group/memcached_exporter-0
index db55a1d50cb9..79f2f7b2827d 100644
--- a/metadata/md5-cache/acct-group/memcached_exporter-0
+++ b/metadata/md5-cache/acct-group/memcached_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc8f63bbf7d3521e03a0de99ab820a1e
diff --git a/metadata/md5-cache/acct-group/messagebus-0-r1 b/metadata/md5-cache/acct-group/messagebus-0-r1
index 1059a96586a7..14129bae702b 100644
--- a/metadata/md5-cache/acct-group/messagebus-0-r1
+++ b/metadata/md5-cache/acct-group/messagebus-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=860f2596cf94e95665239c83f026878a
diff --git a/metadata/md5-cache/acct-group/mgraph-0 b/metadata/md5-cache/acct-group/mgraph-0
index 72af0bc8982d..1b57ce5217d0 100644
--- a/metadata/md5-cache/acct-group/mgraph-0
+++ b/metadata/md5-cache/acct-group/mgraph-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6345345d829146536dbc3fe3673913fe
diff --git a/metadata/md5-cache/acct-group/milter-regex-0-r1 b/metadata/md5-cache/acct-group/milter-regex-0-r1
index c46c11032cb1..47cd51f907ae 100644
--- a/metadata/md5-cache/acct-group/milter-regex-0-r1
+++ b/metadata/md5-cache/acct-group/milter-regex-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c286cc6151cd347d255237afe6a7b95f
diff --git a/metadata/md5-cache/acct-group/minbif-0 b/metadata/md5-cache/acct-group/minbif-0
index de2f2d79436f..40947b55be0d 100644
--- a/metadata/md5-cache/acct-group/minbif-0
+++ b/metadata/md5-cache/acct-group/minbif-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c76205c31b09f6c8aca8bb05f502d699
diff --git a/metadata/md5-cache/acct-group/minecraft-0-r1 b/metadata/md5-cache/acct-group/minecraft-0-r1
index bda6e00a44fa..193bad7c381c 100644
--- a/metadata/md5-cache/acct-group/minecraft-0-r1
+++ b/metadata/md5-cache/acct-group/minecraft-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=07b9a54b36bf205d245a634658b5bdca
diff --git a/metadata/md5-cache/acct-group/minetest-0-r1 b/metadata/md5-cache/acct-group/minetest-0-r1
index db3f25c20263..632a171b3625 100644
--- a/metadata/md5-cache/acct-group/minetest-0-r1
+++ b/metadata/md5-cache/acct-group/minetest-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4931474a343565983bc41ee65479966b
diff --git a/metadata/md5-cache/acct-group/minidlna-0 b/metadata/md5-cache/acct-group/minidlna-0
index 9a5167423e0e..7265623f45a4 100644
--- a/metadata/md5-cache/acct-group/minidlna-0
+++ b/metadata/md5-cache/acct-group/minidlna-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0fe840718048e692eaf606ea5325d081
diff --git a/metadata/md5-cache/acct-group/minio-0 b/metadata/md5-cache/acct-group/minio-0
index 5fa52acb27c3..0319f42fa24c 100644
--- a/metadata/md5-cache/acct-group/minio-0
+++ b/metadata/md5-cache/acct-group/minio-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e27b295ea1d7a3168d3a5e8ddb61d81c
diff --git a/metadata/md5-cache/acct-group/mogile-0 b/metadata/md5-cache/acct-group/mogile-0
index 745dc0e55ab6..75818ae83cad 100644
--- a/metadata/md5-cache/acct-group/mogile-0
+++ b/metadata/md5-cache/acct-group/mogile-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eb8dccd0a48e96ca4a7973fdd82c48d5
diff --git a/metadata/md5-cache/acct-group/mongodb-0-r1 b/metadata/md5-cache/acct-group/mongodb-0-r1
index f568e924ce6e..fac1ad79a843 100644
--- a/metadata/md5-cache/acct-group/mongodb-0-r1
+++ b/metadata/md5-cache/acct-group/mongodb-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3bf1d667ee317fc26d5bfb0b89bd54a0
diff --git a/metadata/md5-cache/acct-group/mongodb_exporter-0 b/metadata/md5-cache/acct-group/mongodb_exporter-0
index 0fd866390c0d..78662e25fb3d 100644
--- a/metadata/md5-cache/acct-group/mongodb_exporter-0
+++ b/metadata/md5-cache/acct-group/mongodb_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=33bf666a5db0c5a772cc4d65d563ce0c
diff --git a/metadata/md5-cache/acct-group/monitorix-0-r1 b/metadata/md5-cache/acct-group/monitorix-0-r1
index 8dedb1fe6219..3903512cc1c7 100644
--- a/metadata/md5-cache/acct-group/monitorix-0-r1
+++ b/metadata/md5-cache/acct-group/monitorix-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=676caa4ebe1136cd3d2e4dd2248ce500
diff --git a/metadata/md5-cache/acct-group/monkeyd-0 b/metadata/md5-cache/acct-group/monkeyd-0
index 1ab7b28bbd47..42be13b385a5 100644
--- a/metadata/md5-cache/acct-group/monkeyd-0
+++ b/metadata/md5-cache/acct-group/monkeyd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4c53e5082a920b16acd70700eddc8b94
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0-r1 b/metadata/md5-cache/acct-group/monkeysphere-0-r1
index 57cbba47ad89..68006fbd1dd2 100644
--- a/metadata/md5-cache/acct-group/monkeysphere-0-r1
+++ b/metadata/md5-cache/acct-group/monkeysphere-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2e21df9eebb5ce23b63d3e08ad3f6743
diff --git a/metadata/md5-cache/acct-group/mosquitto-0-r1 b/metadata/md5-cache/acct-group/mosquitto-0-r1
index 4d7a6feaab74..94188dd60e4a 100644
--- a/metadata/md5-cache/acct-group/mosquitto-0-r1
+++ b/metadata/md5-cache/acct-group/mosquitto-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1d93482e08b728073792f35ad3197779
diff --git a/metadata/md5-cache/acct-group/motion-0-r1 b/metadata/md5-cache/acct-group/motion-0-r1
index 5fd478185d63..df86023cd4d5 100644
--- a/metadata/md5-cache/acct-group/motion-0-r1
+++ b/metadata/md5-cache/acct-group/motion-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3830275cd7a4c71ee27217edea3bc413
diff --git a/metadata/md5-cache/acct-group/msmtpd-0-r1 b/metadata/md5-cache/acct-group/msmtpd-0-r1
index c8f6607a4df0..10a2c182aba7 100644
--- a/metadata/md5-cache/acct-group/msmtpd-0-r1
+++ b/metadata/md5-cache/acct-group/msmtpd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=05a49a4727b726689e845d607a968ec5
diff --git a/metadata/md5-cache/acct-group/munge-0 b/metadata/md5-cache/acct-group/munge-0
index 85c0967e6812..5b8787b06b56 100644
--- a/metadata/md5-cache/acct-group/munge-0
+++ b/metadata/md5-cache/acct-group/munge-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f4271f090e2d7c3b9daaaa7b2dcfc250
diff --git a/metadata/md5-cache/acct-group/munin-0-r1 b/metadata/md5-cache/acct-group/munin-0-r1
index 22cb27b5c5ad..bb3190b26348 100644
--- a/metadata/md5-cache/acct-group/munin-0-r1
+++ b/metadata/md5-cache/acct-group/munin-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=98b464359f4edd282b9907144542d12e
diff --git a/metadata/md5-cache/acct-group/murmur-0-r1 b/metadata/md5-cache/acct-group/murmur-0-r1
index 9ca6126b2777..2169c514db7c 100644
--- a/metadata/md5-cache/acct-group/murmur-0-r1
+++ b/metadata/md5-cache/acct-group/murmur-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=073eb06b74fcebce02306ae4042a6c81
diff --git a/metadata/md5-cache/acct-group/mysql-0-r1 b/metadata/md5-cache/acct-group/mysql-0-r1
index fb5c31defc0e..8bf3b55c95d1 100644
--- a/metadata/md5-cache/acct-group/mysql-0-r1
+++ b/metadata/md5-cache/acct-group/mysql-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e8d05229154e1bc1a029f8e56a618e6f
diff --git a/metadata/md5-cache/acct-group/mysqld_exporter-0-r1 b/metadata/md5-cache/acct-group/mysqld_exporter-0-r1
index e0d36f7ac3bb..facd71f7d2ae 100644
--- a/metadata/md5-cache/acct-group/mysqld_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/mysqld_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6e0e84b5ddca0241b982f7537ab31097
diff --git a/metadata/md5-cache/acct-group/mythtv-0-r1 b/metadata/md5-cache/acct-group/mythtv-0-r1
index 90509d6cdeb1..3310c7db92eb 100644
--- a/metadata/md5-cache/acct-group/mythtv-0-r1
+++ b/metadata/md5-cache/acct-group/mythtv-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e805d52dce53503a96104e9591c06e39
diff --git a/metadata/md5-cache/acct-group/nagios-0-r1 b/metadata/md5-cache/acct-group/nagios-0-r1
index 95910e19e41c..a04a99ecbb57 100644
--- a/metadata/md5-cache/acct-group/nagios-0-r1
+++ b/metadata/md5-cache/acct-group/nagios-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=326535b7e0fc7dd8049f7228af275525
diff --git a/metadata/md5-cache/acct-group/named-0-r1 b/metadata/md5-cache/acct-group/named-0-r1
index 01e5b37abbc8..b17d4e5ff9d0 100644
--- a/metadata/md5-cache/acct-group/named-0-r1
+++ b/metadata/md5-cache/acct-group/named-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=167cc1f18b1fcddbd4615ca0adbafa17
diff --git a/metadata/md5-cache/acct-group/netbox-0-r1 b/metadata/md5-cache/acct-group/netbox-0-r1
index fabe485f3c6f..9fa6a43a5799 100644
--- a/metadata/md5-cache/acct-group/netbox-0-r1
+++ b/metadata/md5-cache/acct-group/netbox-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=65ef9a0acf0ef3eb808cc22bb6b14ca3
diff --git a/metadata/md5-cache/acct-group/netdata-0-r1 b/metadata/md5-cache/acct-group/netdata-0-r1
index e06619898c6d..78cf3cbc5ca2 100644
--- a/metadata/md5-cache/acct-group/netdata-0-r1
+++ b/metadata/md5-cache/acct-group/netdata-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=34b26041debe1ccfc3c378fe73e04f6c
diff --git a/metadata/md5-cache/acct-group/netdev-0-r1 b/metadata/md5-cache/acct-group/netdev-0-r1
index 95a971153643..623a3e143eff 100644
--- a/metadata/md5-cache/acct-group/netdev-0-r1
+++ b/metadata/md5-cache/acct-group/netdev-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7673f8b57c7ecf176bbc51574059a022
diff --git a/metadata/md5-cache/acct-group/netperf-0 b/metadata/md5-cache/acct-group/netperf-0
index 3e6d85f770f1..2dcaa2600167 100644
--- a/metadata/md5-cache/acct-group/netperf-0
+++ b/metadata/md5-cache/acct-group/netperf-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=36de3a0e486846e535e569a5d34c271d
diff --git a/metadata/md5-cache/acct-group/neutron-0-r1 b/metadata/md5-cache/acct-group/neutron-0-r1
index 33d6ddb3fe16..06c8d3a4f43b 100644
--- a/metadata/md5-cache/acct-group/neutron-0-r1
+++ b/metadata/md5-cache/acct-group/neutron-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c058f2e93fc39a15c0e0e4f13a8921a9
diff --git a/metadata/md5-cache/acct-group/nginx-0-r1 b/metadata/md5-cache/acct-group/nginx-0-r1
index 3020c958a4dc..dce79575c0af 100644
--- a/metadata/md5-cache/acct-group/nginx-0-r1
+++ b/metadata/md5-cache/acct-group/nginx-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=47c6e7e599368a44c50df99b92509dd6
diff --git a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1 b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
index 2128deaea32d..7c2b3be928f6 100644
--- a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
+++ b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=371e403874b8c2ccabd967a8ff7d6444
diff --git a/metadata/md5-cache/acct-group/ngircd-0-r1 b/metadata/md5-cache/acct-group/ngircd-0-r1
index ece56643b683..4fb78c575a04 100644
--- a/metadata/md5-cache/acct-group/ngircd-0-r1
+++ b/metadata/md5-cache/acct-group/ngircd-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fa4de52a3ae1cc1f1a555e161f3a21af
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r1 b/metadata/md5-cache/acct-group/ngrep-0-r1
index 63d69197a498..966f39bc47a3 100644
--- a/metadata/md5-cache/acct-group/ngrep-0-r1
+++ b/metadata/md5-cache/acct-group/ngrep-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=21b9b50342a1745d1821796d410bf95a
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0 b/metadata/md5-cache/acct-group/nm-openconnect-0
index 97450c7c0804..6ce882835276 100644
--- a/metadata/md5-cache/acct-group/nm-openconnect-0
+++ b/metadata/md5-cache/acct-group/nm-openconnect-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=828688dff44247448fcb77741ca82c4b
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0 b/metadata/md5-cache/acct-group/nm-openvpn-0
index 93b752cc71e9..20b1bbb58b5b 100644
--- a/metadata/md5-cache/acct-group/nm-openvpn-0
+++ b/metadata/md5-cache/acct-group/nm-openvpn-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=435972a37aa86bf93a159432669be8c0
diff --git a/metadata/md5-cache/acct-group/nobody-0 b/metadata/md5-cache/acct-group/nobody-0
index 052684f2555b..d85e6db1b620 100644
--- a/metadata/md5-cache/acct-group/nobody-0
+++ b/metadata/md5-cache/acct-group/nobody-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8758ecac83bafc0d1197df48dd925fd2
diff --git a/metadata/md5-cache/acct-group/node_exporter-0-r1 b/metadata/md5-cache/acct-group/node_exporter-0-r1
index 12b3db039e26..b87acc9bc4ae 100644
--- a/metadata/md5-cache/acct-group/node_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/node_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6fa2ae942bd21fc2ed167fdb3c8691e3
diff --git a/metadata/md5-cache/acct-group/nofiles-0-r1 b/metadata/md5-cache/acct-group/nofiles-0-r1
index 9db81495c47e..dfb054f08292 100644
--- a/metadata/md5-cache/acct-group/nofiles-0-r1
+++ b/metadata/md5-cache/acct-group/nofiles-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ec57eb799e3c136d40ef8af9bd0d8827
diff --git a/metadata/md5-cache/acct-group/notary-0 b/metadata/md5-cache/acct-group/notary-0
index 6ea1ddb36c5d..3f1bb1d69f50 100644
--- a/metadata/md5-cache/acct-group/notary-0
+++ b/metadata/md5-cache/acct-group/notary-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1e501e1e320c5a526a89c16508ae40ed
diff --git a/metadata/md5-cache/acct-group/nova-0-r1 b/metadata/md5-cache/acct-group/nova-0-r1
index 5327517e8b97..f01b4f01c816 100644
--- a/metadata/md5-cache/acct-group/nova-0-r1
+++ b/metadata/md5-cache/acct-group/nova-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=68731c2a87b669070f2036a658e5378c
diff --git a/metadata/md5-cache/acct-group/nsd-0-r1 b/metadata/md5-cache/acct-group/nsd-0-r1
index e0caa1a6a2af..5001d48adf13 100644
--- a/metadata/md5-cache/acct-group/nsd-0-r1
+++ b/metadata/md5-cache/acct-group/nsd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d9ac42adab7c0123fb4d89c5b9a87e94
diff --git a/metadata/md5-cache/acct-group/nslcd-0-r1 b/metadata/md5-cache/acct-group/nslcd-0-r1
index 6a491c219dcb..c86df4579998 100644
--- a/metadata/md5-cache/acct-group/nslcd-0-r1
+++ b/metadata/md5-cache/acct-group/nslcd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0d665e6cb6e5536bc1dd678572ef427e
diff --git a/metadata/md5-cache/acct-group/ntopng-0 b/metadata/md5-cache/acct-group/ntopng-0
index 576f3bf8ab5c..97c45886b55e 100644
--- a/metadata/md5-cache/acct-group/ntopng-0
+++ b/metadata/md5-cache/acct-group/ntopng-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=35e9e7e095b309ec30d298df5ef73598
diff --git a/metadata/md5-cache/acct-group/ntp-0-r1 b/metadata/md5-cache/acct-group/ntp-0-r1
index e29790b2a1dd..3804b22f2e3f 100644
--- a/metadata/md5-cache/acct-group/ntp-0-r1
+++ b/metadata/md5-cache/acct-group/ntp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b944216def225db8a4e6d36df6d79253
diff --git a/metadata/md5-cache/acct-group/nullmail-0 b/metadata/md5-cache/acct-group/nullmail-0
index aeef28e0fc44..b4c203cc260e 100644
--- a/metadata/md5-cache/acct-group/nullmail-0
+++ b/metadata/md5-cache/acct-group/nullmail-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=03002131a7409438844d4496bd39709b
diff --git a/metadata/md5-cache/acct-group/nut-0 b/metadata/md5-cache/acct-group/nut-0
index 719c3be720dc..64e47a5a2265 100644
--- a/metadata/md5-cache/acct-group/nut-0
+++ b/metadata/md5-cache/acct-group/nut-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=06b31b41041e4d1a605271e08371c5be
diff --git a/metadata/md5-cache/acct-group/nzbget-0 b/metadata/md5-cache/acct-group/nzbget-0
index 09bf7119db5b..594f4c315ae6 100644
--- a/metadata/md5-cache/acct-group/nzbget-0
+++ b/metadata/md5-cache/acct-group/nzbget-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c6ec1d3cc1d3ffdcb57a8b831ac2886c
diff --git a/metadata/md5-cache/acct-group/oidentd-0-r1 b/metadata/md5-cache/acct-group/oidentd-0-r1
index 56a9550821a0..f302eaf81010 100644
--- a/metadata/md5-cache/acct-group/oidentd-0-r1
+++ b/metadata/md5-cache/acct-group/oidentd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e314a1278ff5232a107383ed41b95900
diff --git a/metadata/md5-cache/acct-group/openct-0-r1 b/metadata/md5-cache/acct-group/openct-0-r1
index 0c3bc507cbe9..60b0c197968f 100644
--- a/metadata/md5-cache/acct-group/openct-0-r1
+++ b/metadata/md5-cache/acct-group/openct-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7ae8badd59b78a22a19e96bd974bccc1
diff --git a/metadata/md5-cache/acct-group/opendkim-0-r1 b/metadata/md5-cache/acct-group/opendkim-0-r1
index 64cf7cd99c12..3f80db3c0049 100644
--- a/metadata/md5-cache/acct-group/opendkim-0-r1
+++ b/metadata/md5-cache/acct-group/opendkim-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5c029cf0da543d31566d1480be4dc981
diff --git a/metadata/md5-cache/acct-group/opendmarc-1 b/metadata/md5-cache/acct-group/opendmarc-1
index 9d1f10cbd7dd..4230657d9276 100644
--- a/metadata/md5-cache/acct-group/opendmarc-1
+++ b/metadata/md5-cache/acct-group/opendmarc-1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=733375fffc601727af32838d78f78ed3
diff --git a/metadata/md5-cache/acct-group/opendnssec-0 b/metadata/md5-cache/acct-group/opendnssec-0
index 3165d46ed4eb..4fc81978a9d9 100644
--- a/metadata/md5-cache/acct-group/opendnssec-0
+++ b/metadata/md5-cache/acct-group/opendnssec-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=abc693e4c90009a43cb59b2149e9ea9c
diff --git a/metadata/md5-cache/acct-group/openntpd-0-r1 b/metadata/md5-cache/acct-group/openntpd-0-r1
index e331fc55c1b2..1010f5da80d3 100644
--- a/metadata/md5-cache/acct-group/openntpd-0-r1
+++ b/metadata/md5-cache/acct-group/openntpd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3422620740b2551aa2e8fd086b0af290
diff --git a/metadata/md5-cache/acct-group/openrct2-0-r1 b/metadata/md5-cache/acct-group/openrct2-0-r1
index 690a2dfa2dc4..576ef5536db0 100644
--- a/metadata/md5-cache/acct-group/openrct2-0-r1
+++ b/metadata/md5-cache/acct-group/openrct2-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4a35352505c94280edbef8b207dc7cfc
diff --git a/metadata/md5-cache/acct-group/openttd-0 b/metadata/md5-cache/acct-group/openttd-0
index 5124a2239dbd..a4403b032660 100644
--- a/metadata/md5-cache/acct-group/openttd-0
+++ b/metadata/md5-cache/acct-group/openttd-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=37dc4232a20c5ae0a589793fbfeceff8
diff --git a/metadata/md5-cache/acct-group/openvpn-0-r1 b/metadata/md5-cache/acct-group/openvpn-0-r1
index d16bd81dd1d2..769d03a08be9 100644
--- a/metadata/md5-cache/acct-group/openvpn-0-r1
+++ b/metadata/md5-cache/acct-group/openvpn-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=54a060154a0e6cf7e576e88dd46e80c3
diff --git a/metadata/md5-cache/acct-group/openvpn_exporter-0-r1 b/metadata/md5-cache/acct-group/openvpn_exporter-0-r1
index 4bdaed944508..8dacefb609cf 100644
--- a/metadata/md5-cache/acct-group/openvpn_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/openvpn_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4a70c13a5cc33521b2697017678f5f30
diff --git a/metadata/md5-cache/acct-group/opm-0 b/metadata/md5-cache/acct-group/opm-0
index c8077cb98a01..3d178e3bd704 100644
--- a/metadata/md5-cache/acct-group/opm-0
+++ b/metadata/md5-cache/acct-group/opm-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=864adf9233b933bb62c0bbd0b04558cd
diff --git a/metadata/md5-cache/acct-group/oprofile-0-r1 b/metadata/md5-cache/acct-group/oprofile-0-r1
index 7aa2562e6663..ff02b08dcb67 100644
--- a/metadata/md5-cache/acct-group/oprofile-0-r1
+++ b/metadata/md5-cache/acct-group/oprofile-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=463da443d4bc817924c9c3695a11ad95
diff --git a/metadata/md5-cache/acct-group/oragono-0 b/metadata/md5-cache/acct-group/oragono-0
index 0ae0c0e518ea..3a9e7e2f350a 100644
--- a/metadata/md5-cache/acct-group/oragono-0
+++ b/metadata/md5-cache/acct-group/oragono-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=00a80ddc7917241e83dbf31efbf74f4e
diff --git a/metadata/md5-cache/acct-group/ossec-0-r1 b/metadata/md5-cache/acct-group/ossec-0-r1
index b708569ea6c1..45d281f324a7 100644
--- a/metadata/md5-cache/acct-group/ossec-0-r1
+++ b/metadata/md5-cache/acct-group/ossec-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b3f929f8c4212f258598b9ea21a0a5b3
diff --git a/metadata/md5-cache/acct-group/p2p-0 b/metadata/md5-cache/acct-group/p2p-0
index 4c7deba98665..ecdcae84a6d8 100644
--- a/metadata/md5-cache/acct-group/p2p-0
+++ b/metadata/md5-cache/acct-group/p2p-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0919eacea3b9a36ed7503f44b1eb889e
diff --git a/metadata/md5-cache/acct-group/partimag-0-r1 b/metadata/md5-cache/acct-group/partimag-0-r1
index 398ecb06d8e3..7b76f90ecf92 100644
--- a/metadata/md5-cache/acct-group/partimag-0-r1
+++ b/metadata/md5-cache/acct-group/partimag-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ba00c180432799cd15b405d6d8431480
diff --git a/metadata/md5-cache/acct-group/pcap-0 b/metadata/md5-cache/acct-group/pcap-0
index cce5fa7d5953..1ceeeb883fc5 100644
--- a/metadata/md5-cache/acct-group/pcap-0
+++ b/metadata/md5-cache/acct-group/pcap-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b54edec284614c6f7c5c470e6cefec75
diff --git a/metadata/md5-cache/acct-group/pcscd-0-r1 b/metadata/md5-cache/acct-group/pcscd-0-r1
index 7ca59fc1acda..103c2712797d 100644
--- a/metadata/md5-cache/acct-group/pcscd-0-r1
+++ b/metadata/md5-cache/acct-group/pcscd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=aec8bc8ba57390489ba4fe0a4d3311bc
diff --git a/metadata/md5-cache/acct-group/pdns-0-r1 b/metadata/md5-cache/acct-group/pdns-0-r1
index e58e7a6b83dd..9c6522d25fd4 100644
--- a/metadata/md5-cache/acct-group/pdns-0-r1
+++ b/metadata/md5-cache/acct-group/pdns-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=aa85c76ad14795d0cff4f9323c08adb8
diff --git a/metadata/md5-cache/acct-group/pdnsd-0-r1 b/metadata/md5-cache/acct-group/pdnsd-0-r1
index 40799b38c3a8..65a375dca8a4 100644
--- a/metadata/md5-cache/acct-group/pdnsd-0-r1
+++ b/metadata/md5-cache/acct-group/pdnsd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=03cb63a021c4717898cc98235ea25a16
diff --git a/metadata/md5-cache/acct-group/pgagent-0 b/metadata/md5-cache/acct-group/pgagent-0
index c5d8b3bc34be..1a200fbafa9d 100644
--- a/metadata/md5-cache/acct-group/pgagent-0
+++ b/metadata/md5-cache/acct-group/pgagent-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b724096dd1af210d584316579db9a1c3
diff --git a/metadata/md5-cache/acct-group/pipewire-0 b/metadata/md5-cache/acct-group/pipewire-0
index 867a2dcbbeb7..c43b84c5fd4f 100644
--- a/metadata/md5-cache/acct-group/pipewire-0
+++ b/metadata/md5-cache/acct-group/pipewire-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=19d544345876a95c03608275f9f27182
diff --git a/metadata/md5-cache/acct-group/pkcs11-0 b/metadata/md5-cache/acct-group/pkcs11-0
index 64ecd42e2bdd..945973a0d837 100644
--- a/metadata/md5-cache/acct-group/pkcs11-0
+++ b/metadata/md5-cache/acct-group/pkcs11-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4f60387e00c9fb0d6a92b45c2aeabc47
diff --git a/metadata/md5-cache/acct-group/placement-0-r1 b/metadata/md5-cache/acct-group/placement-0-r1
index fe649d448785..c0240c1fd55b 100644
--- a/metadata/md5-cache/acct-group/placement-0-r1
+++ b/metadata/md5-cache/acct-group/placement-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7d315bb1371677e9fe580d9209b28041
diff --git a/metadata/md5-cache/acct-group/plex-0-r1 b/metadata/md5-cache/acct-group/plex-0-r1
index a66c46cad940..5d265232059d 100644
--- a/metadata/md5-cache/acct-group/plex-0-r1
+++ b/metadata/md5-cache/acct-group/plex-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0130489d81423e43cb2855ffc52ffa31
diff --git a/metadata/md5-cache/acct-group/plugdev-0-r1 b/metadata/md5-cache/acct-group/plugdev-0-r1
index e073d3cf8d64..db784db0e905 100644
--- a/metadata/md5-cache/acct-group/plugdev-0-r1
+++ b/metadata/md5-cache/acct-group/plugdev-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b33c32ef98fcea71cbc08197e1009825
diff --git a/metadata/md5-cache/acct-group/polkitd-0-r1 b/metadata/md5-cache/acct-group/polkitd-0-r1
index 88eb9f789202..8baead98f4af 100644
--- a/metadata/md5-cache/acct-group/polkitd-0-r1
+++ b/metadata/md5-cache/acct-group/polkitd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ed82d36920fd2f69d8ce17a32001e4eb
diff --git a/metadata/md5-cache/acct-group/polw-0 b/metadata/md5-cache/acct-group/polw-0
index b3cd028fe6a8..9f8c45d71acc 100644
--- a/metadata/md5-cache/acct-group/polw-0
+++ b/metadata/md5-cache/acct-group/polw-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a9ae25a422f669676df8719deed9df84
diff --git a/metadata/md5-cache/acct-group/popa3d-0 b/metadata/md5-cache/acct-group/popa3d-0
index b9107e8f210c..cceb776b1795 100644
--- a/metadata/md5-cache/acct-group/popa3d-0
+++ b/metadata/md5-cache/acct-group/popa3d-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2bb067bc1e17d22bdb6e94d4c2c04b30
diff --git a/metadata/md5-cache/acct-group/portage-0 b/metadata/md5-cache/acct-group/portage-0
index 438bfb805e03..4ee99739af19 100644
--- a/metadata/md5-cache/acct-group/portage-0
+++ b/metadata/md5-cache/acct-group/portage-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f0dd18569703abd68c5a3b7affe9ac7a
diff --git a/metadata/md5-cache/acct-group/postdrop-0-r1 b/metadata/md5-cache/acct-group/postdrop-0-r1
index a8f8c013d7b0..d9cc3fd91e3c 100644
--- a/metadata/md5-cache/acct-group/postdrop-0-r1
+++ b/metadata/md5-cache/acct-group/postdrop-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0702ccb78ceb5a0de83f8036d23a5b20
diff --git a/metadata/md5-cache/acct-group/postfix-0-r1 b/metadata/md5-cache/acct-group/postfix-0-r1
index 6a047320bb90..b8dacc8ee012 100644
--- a/metadata/md5-cache/acct-group/postfix-0-r1
+++ b/metadata/md5-cache/acct-group/postfix-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ebf102804845c73267bc6e97840448e0
diff --git a/metadata/md5-cache/acct-group/postfix_exporter-0-r1 b/metadata/md5-cache/acct-group/postfix_exporter-0-r1
index 0af3d1f1cc44..a6c672105e86 100644
--- a/metadata/md5-cache/acct-group/postfix_exporter-0-r1
+++ b/metadata/md5-cache/acct-group/postfix_exporter-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b4bbd58d9302d79fadfe9c9b11fe92f8
diff --git a/metadata/md5-cache/acct-group/postfwd-0 b/metadata/md5-cache/acct-group/postfwd-0
index 79338d6d65ab..b45ab607f25d 100644
--- a/metadata/md5-cache/acct-group/postfwd-0
+++ b/metadata/md5-cache/acct-group/postfwd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8ef944f4ec3fbe2445aa00af01fac571
diff --git a/metadata/md5-cache/acct-group/postgres-0-r1 b/metadata/md5-cache/acct-group/postgres-0-r1
index 501d7f7b422e..326cfa50d4cf 100644
--- a/metadata/md5-cache/acct-group/postgres-0-r1
+++ b/metadata/md5-cache/acct-group/postgres-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=81a6b6fba54b4c4b46c069a31b8db6a8
diff --git a/metadata/md5-cache/acct-group/postgres_exporter-0 b/metadata/md5-cache/acct-group/postgres_exporter-0
index 470f04fb51d0..291c53ec1292 100644
--- a/metadata/md5-cache/acct-group/postgres_exporter-0
+++ b/metadata/md5-cache/acct-group/postgres_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d2fe698b80fec11241c2e3b706ea422a
diff --git a/metadata/md5-cache/acct-group/postgrey-0 b/metadata/md5-cache/acct-group/postgrey-0
index 7e31ac44483e..8374fffd6bc6 100644
--- a/metadata/md5-cache/acct-group/postgrey-0
+++ b/metadata/md5-cache/acct-group/postgrey-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b699e52ccda94fcc09679f8fcd403a6a
diff --git a/metadata/md5-cache/acct-group/privoxy-0-r1 b/metadata/md5-cache/acct-group/privoxy-0-r1
index ac1176630eb6..b98fdf2d50ba 100644
--- a/metadata/md5-cache/acct-group/privoxy-0-r1
+++ b/metadata/md5-cache/acct-group/privoxy-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=56b3af069769af8c2d24127d8f30a43b
diff --git a/metadata/md5-cache/acct-group/prometheus-0-r1 b/metadata/md5-cache/acct-group/prometheus-0-r1
index d7875c81f960..4566672ce358 100644
--- a/metadata/md5-cache/acct-group/prometheus-0-r1
+++ b/metadata/md5-cache/acct-group/prometheus-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=aac72e817961e6fc2302327e78f702ea
diff --git a/metadata/md5-cache/acct-group/prosody-0 b/metadata/md5-cache/acct-group/prosody-0
index dcb2daf39c00..683218569997 100644
--- a/metadata/md5-cache/acct-group/prosody-0
+++ b/metadata/md5-cache/acct-group/prosody-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ac4d64f0a638d16563bdedbd96a90514
diff --git a/metadata/md5-cache/acct-group/psybnc-0 b/metadata/md5-cache/acct-group/psybnc-0
index 551c6f28d2a7..488699e42886 100644
--- a/metadata/md5-cache/acct-group/psybnc-0
+++ b/metadata/md5-cache/acct-group/psybnc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=be54e5a441999e9372694b13fbc461ab
diff --git a/metadata/md5-cache/acct-group/pulse-0 b/metadata/md5-cache/acct-group/pulse-0
index 08afcb7b23fe..5d955de91100 100644
--- a/metadata/md5-cache/acct-group/pulse-0
+++ b/metadata/md5-cache/acct-group/pulse-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=735ba12559ca2d439df3e93e8ad9facf
diff --git a/metadata/md5-cache/acct-group/pulse-access-0 b/metadata/md5-cache/acct-group/pulse-access-0
index 88896e9cc238..06ae04c57c3d 100644
--- a/metadata/md5-cache/acct-group/pulse-access-0
+++ b/metadata/md5-cache/acct-group/pulse-access-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7d0c2c3018cf74e8d1894fd027b91a92
diff --git a/metadata/md5-cache/acct-group/puppet-0-r1 b/metadata/md5-cache/acct-group/puppet-0-r1
index 3c71b9ab32f0..0243bcc9830a 100644
--- a/metadata/md5-cache/acct-group/puppet-0-r1
+++ b/metadata/md5-cache/acct-group/puppet-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0872090f0c9fe91d8e3e004a82ed51b3
diff --git a/metadata/md5-cache/acct-group/puppetdb-0-r1 b/metadata/md5-cache/acct-group/puppetdb-0-r1
index 7c840accd04c..96837e7eb0e6 100644
--- a/metadata/md5-cache/acct-group/puppetdb-0-r1
+++ b/metadata/md5-cache/acct-group/puppetdb-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d2fb66e62cdd56f9910aa7b41df5ce0a
diff --git a/metadata/md5-cache/acct-group/pushgateway-0 b/metadata/md5-cache/acct-group/pushgateway-0
index 42c86d8ee0fe..04a5bac113e5 100644
--- a/metadata/md5-cache/acct-group/pushgateway-0
+++ b/metadata/md5-cache/acct-group/pushgateway-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=973610429b1d0fb6c58b43deca928160
diff --git a/metadata/md5-cache/acct-group/pvpgn-0 b/metadata/md5-cache/acct-group/pvpgn-0
index 4bf4a141a319..455bcd827d92 100644
--- a/metadata/md5-cache/acct-group/pvpgn-0
+++ b/metadata/md5-cache/acct-group/pvpgn-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=95d8a6cc6ed44341522209db19b5c694
diff --git a/metadata/md5-cache/acct-group/qemu-0-r1 b/metadata/md5-cache/acct-group/qemu-0-r1
index d24421ddfe06..8188e197a945 100644
--- a/metadata/md5-cache/acct-group/qemu-0-r1
+++ b/metadata/md5-cache/acct-group/qemu-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=60c5dfe4397aabfe49409784f51bc2a8
diff --git a/metadata/md5-cache/acct-group/qmail-0-r1 b/metadata/md5-cache/acct-group/qmail-0-r1
index d952cbacb948..63313d555966 100644
--- a/metadata/md5-cache/acct-group/qmail-0-r1
+++ b/metadata/md5-cache/acct-group/qmail-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=213852652a6174690fab12f921163758
diff --git a/metadata/md5-cache/acct-group/quagga-0-r1 b/metadata/md5-cache/acct-group/quagga-0-r1
index 676aa89175e4..8577290b133a 100644
--- a/metadata/md5-cache/acct-group/quagga-0-r1
+++ b/metadata/md5-cache/acct-group/quagga-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=79b08023b1940af48cb906f3700a391f
diff --git a/metadata/md5-cache/acct-group/quassel-0-r1 b/metadata/md5-cache/acct-group/quassel-0-r1
index b13389694338..b5842137958f 100644
--- a/metadata/md5-cache/acct-group/quassel-0-r1
+++ b/metadata/md5-cache/acct-group/quassel-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a8770cd4c83dde286408710a5d55115c
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0 b/metadata/md5-cache/acct-group/rabbitmq-0
index d0d0e41ffedf..39000ec77e17 100644
--- a/metadata/md5-cache/acct-group/rabbitmq-0
+++ b/metadata/md5-cache/acct-group/rabbitmq-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ab4b417278e62a735f425076f9415f59
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
index 85065cc9e7fe..b7cefdf2bea5 100644
--- a/metadata/md5-cache/acct-group/rabbitmq_exporter-0
+++ b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ed80fb06b0243b2988e1ab851e9827d0
diff --git a/metadata/md5-cache/acct-group/radicale-0-r1 b/metadata/md5-cache/acct-group/radicale-0-r1
index e9c12662a4fc..8ffe6611131c 100644
--- a/metadata/md5-cache/acct-group/radicale-0-r1
+++ b/metadata/md5-cache/acct-group/radicale-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=624bff0245761984fe21261a6a767c4c
diff --git a/metadata/md5-cache/acct-group/radius-0-r1 b/metadata/md5-cache/acct-group/radius-0-r1
index 9462e6819ad1..6693e9ca712d 100644
--- a/metadata/md5-cache/acct-group/radius-0-r1
+++ b/metadata/md5-cache/acct-group/radius-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=271f5d01176fd1e959f49c94b24a47e6
diff --git a/metadata/md5-cache/acct-group/radvd-0 b/metadata/md5-cache/acct-group/radvd-0
index 6594f2943bf0..ad2b47d680ee 100644
--- a/metadata/md5-cache/acct-group/radvd-0
+++ b/metadata/md5-cache/acct-group/radvd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cc8204607b8e02e7a1fcd778a5091b0f
diff --git a/metadata/md5-cache/acct-group/rbldns-0-r1 b/metadata/md5-cache/acct-group/rbldns-0-r1
index 7025762265d5..739cc1b40b04 100644
--- a/metadata/md5-cache/acct-group/rbldns-0-r1
+++ b/metadata/md5-cache/acct-group/rbldns-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=843fc7f34c310dfc674db22032ed027a
diff --git a/metadata/md5-cache/acct-group/rbot-0 b/metadata/md5-cache/acct-group/rbot-0
index b8eaec05a9d0..2acec12c4057 100644
--- a/metadata/md5-cache/acct-group/rbot-0
+++ b/metadata/md5-cache/acct-group/rbot-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6f094ee834ca494e4b37de9f3ef04c2d
diff --git a/metadata/md5-cache/acct-group/realtime-0 b/metadata/md5-cache/acct-group/realtime-0
index 5d6f51da5f1a..e484c38b1ef0 100644
--- a/metadata/md5-cache/acct-group/realtime-0
+++ b/metadata/md5-cache/acct-group/realtime-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1c9d4d12ef8b62c4f7e6fdef42c9921a
diff --git a/metadata/md5-cache/acct-group/redis-0-r1 b/metadata/md5-cache/acct-group/redis-0-r1
index 293503fda246..46b3975dfd85 100644
--- a/metadata/md5-cache/acct-group/redis-0-r1
+++ b/metadata/md5-cache/acct-group/redis-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=71916ed717a3099620283f9bb17e6fe5
diff --git a/metadata/md5-cache/acct-group/redis_exporter-0 b/metadata/md5-cache/acct-group/redis_exporter-0
index b2e936cf86fe..8b3c995d614d 100644
--- a/metadata/md5-cache/acct-group/redis_exporter-0
+++ b/metadata/md5-cache/acct-group/redis_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f3134bb1f0edf68a49604bdc83f3ac28
diff --git a/metadata/md5-cache/acct-group/redmine-0-r1 b/metadata/md5-cache/acct-group/redmine-0-r1
index af8ab5ef98be..287446b3a090 100644
--- a/metadata/md5-cache/acct-group/redmine-0-r1
+++ b/metadata/md5-cache/acct-group/redmine-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fe7181402dd5f6a08b555113b6db4b6d
diff --git a/metadata/md5-cache/acct-group/redsocks-0-r1 b/metadata/md5-cache/acct-group/redsocks-0-r1
index 3411bc2f726b..99dd5d84432a 100644
--- a/metadata/md5-cache/acct-group/redsocks-0-r1
+++ b/metadata/md5-cache/acct-group/redsocks-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2c7476d51a14d3aea7b28564647cfe3c
diff --git a/metadata/md5-cache/acct-group/reg-0-r1 b/metadata/md5-cache/acct-group/reg-0-r1
index a4ea3f888936..694b326d0969 100644
--- a/metadata/md5-cache/acct-group/reg-0-r1
+++ b/metadata/md5-cache/acct-group/reg-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4a84c8da0829b79e7ab0a85c1ed25f7e
diff --git a/metadata/md5-cache/acct-group/registry-0 b/metadata/md5-cache/acct-group/registry-0
index a959790260df..dbe9f6b3b276 100644
--- a/metadata/md5-cache/acct-group/registry-0
+++ b/metadata/md5-cache/acct-group/registry-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=46d6fadf78f77b7cd4efd7025a993364
diff --git a/metadata/md5-cache/acct-group/render-0-r1 b/metadata/md5-cache/acct-group/render-0-r1
index c2108836562f..f153168645e2 100644
--- a/metadata/md5-cache/acct-group/render-0-r1
+++ b/metadata/md5-cache/acct-group/render-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9a17a76bb6d610a7589790bd092c1e15
diff --git a/metadata/md5-cache/acct-group/resin-0 b/metadata/md5-cache/acct-group/resin-0
index 00a1f3d711c6..97fbfa654811 100644
--- a/metadata/md5-cache/acct-group/resin-0
+++ b/metadata/md5-cache/acct-group/resin-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6df35c594caae444f4fa40b95650ca02
diff --git a/metadata/md5-cache/acct-group/roccat-0 b/metadata/md5-cache/acct-group/roccat-0
index bde8f87b8ea4..1ceef2857376 100644
--- a/metadata/md5-cache/acct-group/roccat-0
+++ b/metadata/md5-cache/acct-group/roccat-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=04a2c0506ba3b5a25ece67ff0c907b7a
diff --git a/metadata/md5-cache/acct-group/root-0 b/metadata/md5-cache/acct-group/root-0
index 9cbace7dcad9..cb1db59dbef8 100644
--- a/metadata/md5-cache/acct-group/root-0
+++ b/metadata/md5-cache/acct-group/root-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a7f429a081428d341bb45314a4000434
diff --git a/metadata/md5-cache/acct-group/ros-0 b/metadata/md5-cache/acct-group/ros-0
index 8c1a82795cee..661171d0b530 100644
--- a/metadata/md5-cache/acct-group/ros-0
+++ b/metadata/md5-cache/acct-group/ros-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=156f21246830c23452022b4cb5562758
diff --git a/metadata/md5-cache/acct-group/rplayd-0 b/metadata/md5-cache/acct-group/rplayd-0
index 4d328e364596..1ffbbadac392 100644
--- a/metadata/md5-cache/acct-group/rplayd-0
+++ b/metadata/md5-cache/acct-group/rplayd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d6fedc027767ee546f1a5350e0a4894d
diff --git a/metadata/md5-cache/acct-group/rrdcached-0 b/metadata/md5-cache/acct-group/rrdcached-0
index f4453aab6fc9..8afe66655e98 100644
--- a/metadata/md5-cache/acct-group/rrdcached-0
+++ b/metadata/md5-cache/acct-group/rrdcached-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3016e9ba7b3dd73808869c5f7c1503a1
diff --git a/metadata/md5-cache/acct-group/rslsync-0 b/metadata/md5-cache/acct-group/rslsync-0
index f2da103a8526..62d1f9a1c5da 100644
--- a/metadata/md5-cache/acct-group/rslsync-0
+++ b/metadata/md5-cache/acct-group/rslsync-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=93b159f1d708b6adf94c929a7cf3544c
diff --git a/metadata/md5-cache/acct-group/rspamd-0-r1 b/metadata/md5-cache/acct-group/rspamd-0-r1
index a248782eb829..d9ad01489244 100644
--- a/metadata/md5-cache/acct-group/rspamd-0-r1
+++ b/metadata/md5-cache/acct-group/rspamd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9cbb5ac6e2e998fd23f0267abbfc2fed
diff --git a/metadata/md5-cache/acct-group/rstudio-server-0-r1 b/metadata/md5-cache/acct-group/rstudio-server-0-r1
index 2808811b9700..42f7f04aab63 100644
--- a/metadata/md5-cache/acct-group/rstudio-server-0-r1
+++ b/metadata/md5-cache/acct-group/rstudio-server-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e26c106ae4cd9bb7027b3222b64cf4f4
diff --git a/metadata/md5-cache/acct-group/rt-0-r1 b/metadata/md5-cache/acct-group/rt-0-r1
index 7a6ef1951af8..c1b17f457426 100644
--- a/metadata/md5-cache/acct-group/rt-0-r1
+++ b/metadata/md5-cache/acct-group/rt-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=743c00ae2e6bbb090e3cc37511094e41
diff --git a/metadata/md5-cache/acct-group/rtkit-0-r1 b/metadata/md5-cache/acct-group/rtkit-0-r1
index 2ce8666186b6..fb8f5c16712a 100644
--- a/metadata/md5-cache/acct-group/rtkit-0-r1
+++ b/metadata/md5-cache/acct-group/rtkit-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=88ef1eac9c87beaf1e0a6e36af8e82a4
diff --git a/metadata/md5-cache/acct-group/rundeck-0 b/metadata/md5-cache/acct-group/rundeck-0
index b1938b92cb1f..1fb5740a6704 100644
--- a/metadata/md5-cache/acct-group/rundeck-0
+++ b/metadata/md5-cache/acct-group/rundeck-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=67809b37284cdfca7bdda2e10180be9b
diff --git a/metadata/md5-cache/acct-group/rwhoisd-0 b/metadata/md5-cache/acct-group/rwhoisd-0
index 3024a0817233..ce69bff4aac2 100644
--- a/metadata/md5-cache/acct-group/rwhoisd-0
+++ b/metadata/md5-cache/acct-group/rwhoisd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fcb4222192123b7834ee1a97ff9cb229
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0-r1 b/metadata/md5-cache/acct-group/sabnzbd-0-r1
index ce57104c8836..5c0712be982a 100644
--- a/metadata/md5-cache/acct-group/sabnzbd-0-r1
+++ b/metadata/md5-cache/acct-group/sabnzbd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d4ca27db09b666561e15572145fec31e
diff --git a/metadata/md5-cache/acct-group/sagan-0 b/metadata/md5-cache/acct-group/sagan-0
index a143c67d41b4..63d064e1b182 100644
--- a/metadata/md5-cache/acct-group/sagan-0
+++ b/metadata/md5-cache/acct-group/sagan-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8ff04d9633dc4862007356624278e0e8
diff --git a/metadata/md5-cache/acct-group/samplicator-0 b/metadata/md5-cache/acct-group/samplicator-0
index 90b5549f8cda..a0f8af39be71 100644
--- a/metadata/md5-cache/acct-group/samplicator-0
+++ b/metadata/md5-cache/acct-group/samplicator-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1396d4a695f252db7c8ef8820619ba09
diff --git a/metadata/md5-cache/acct-group/sancp-0 b/metadata/md5-cache/acct-group/sancp-0
index 2a4c3876ef1b..72a784f218f3 100644
--- a/metadata/md5-cache/acct-group/sancp-0
+++ b/metadata/md5-cache/acct-group/sancp-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4f68fb5ade5a80de005cc21e57aa7e88
diff --git a/metadata/md5-cache/acct-group/sanlock-0-r1 b/metadata/md5-cache/acct-group/sanlock-0-r1
index 47ba2a75e1a5..d4bd808ee62f 100644
--- a/metadata/md5-cache/acct-group/sanlock-0-r1
+++ b/metadata/md5-cache/acct-group/sanlock-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=164869b2404ec974ccbcd89d6f081644
diff --git a/metadata/md5-cache/acct-group/sauerbraten-0-r1 b/metadata/md5-cache/acct-group/sauerbraten-0-r1
index 6b5a83498688..c13a12b584ba 100644
--- a/metadata/md5-cache/acct-group/sauerbraten-0-r1
+++ b/metadata/md5-cache/acct-group/sauerbraten-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ca3eab62f12ef6a51f169dbaf736a605
diff --git a/metadata/md5-cache/acct-group/scanlogd-0 b/metadata/md5-cache/acct-group/scanlogd-0
index 06c48fc71e09..7ad09d548f24 100644
--- a/metadata/md5-cache/acct-group/scanlogd-0
+++ b/metadata/md5-cache/acct-group/scanlogd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=02aef9fa4c0506cfafc12a85febb743e
diff --git a/metadata/md5-cache/acct-group/scanner-0 b/metadata/md5-cache/acct-group/scanner-0
index 9e08cbe78f93..6332a058939d 100644
--- a/metadata/md5-cache/acct-group/scanner-0
+++ b/metadata/md5-cache/acct-group/scanner-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9d83c80679ba09b477e36ff9c9c6d512
diff --git a/metadata/md5-cache/acct-group/scponly-0-r1 b/metadata/md5-cache/acct-group/scponly-0-r1
index 3f0b35bc5989..4fd01de299c3 100644
--- a/metadata/md5-cache/acct-group/scponly-0-r1
+++ b/metadata/md5-cache/acct-group/scponly-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=acd253c1dc792a01b660ecad6b5f6c1c
diff --git a/metadata/md5-cache/acct-group/scsi-0 b/metadata/md5-cache/acct-group/scsi-0
index 6aedebf22b27..b777dcac3ac8 100644
--- a/metadata/md5-cache/acct-group/scsi-0
+++ b/metadata/md5-cache/acct-group/scsi-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=428eabc40ecfbe67a343e14dca02120e
diff --git a/metadata/md5-cache/acct-group/sddm-0 b/metadata/md5-cache/acct-group/sddm-0
index 0972d4d6ffaa..33e7895d9e7c 100644
--- a/metadata/md5-cache/acct-group/sddm-0
+++ b/metadata/md5-cache/acct-group/sddm-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5d78b64eec31cbf68aecf9872427c766
diff --git a/metadata/md5-cache/acct-group/seat-0 b/metadata/md5-cache/acct-group/seat-0
index ac23c4e61be3..589149b547bd 100644
--- a/metadata/md5-cache/acct-group/seat-0
+++ b/metadata/md5-cache/acct-group/seat-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4ae11db7bbae3f95369f896c55debee9
diff --git a/metadata/md5-cache/acct-group/serf-0 b/metadata/md5-cache/acct-group/serf-0
index 6eab45459e44..24338ee3b137 100644
--- a/metadata/md5-cache/acct-group/serf-0
+++ b/metadata/md5-cache/acct-group/serf-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=22d08b34909fac7aef088db1012834bd
diff --git a/metadata/md5-cache/acct-group/sguil-0 b/metadata/md5-cache/acct-group/sguil-0
index c550ab35759d..f27736c39faf 100644
--- a/metadata/md5-cache/acct-group/sguil-0
+++ b/metadata/md5-cache/acct-group/sguil-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d346065687075dd82b95d8ecbcfa5292
diff --git a/metadata/md5-cache/acct-group/sgx-0 b/metadata/md5-cache/acct-group/sgx-0
index 4859a694e9fc..fa484017194e 100644
--- a/metadata/md5-cache/acct-group/sgx-0
+++ b/metadata/md5-cache/acct-group/sgx-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=edd04247181af9db92f6f81c7d9429dd
diff --git a/metadata/md5-cache/acct-group/shellinaboxd-0-r1 b/metadata/md5-cache/acct-group/shellinaboxd-0-r1
index 61a5b5e9b1ca..ae42df033846 100644
--- a/metadata/md5-cache/acct-group/shellinaboxd-0-r1
+++ b/metadata/md5-cache/acct-group/shellinaboxd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=829585efad8b7637e908280dc2050106
diff --git a/metadata/md5-cache/acct-group/sigh-0 b/metadata/md5-cache/acct-group/sigh-0
index beb6cec4514d..3f402ffd20ce 100644
--- a/metadata/md5-cache/acct-group/sigh-0
+++ b/metadata/md5-cache/acct-group/sigh-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a28d0284fc5f403aabe72010ef5ea0bc
diff --git a/metadata/md5-cache/acct-group/simplevirt-0-r1 b/metadata/md5-cache/acct-group/simplevirt-0-r1
index 24cbdcec5097..6053bb285102 100644
--- a/metadata/md5-cache/acct-group/simplevirt-0-r1
+++ b/metadata/md5-cache/acct-group/simplevirt-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ae8382162a397a619f61011bea92b8e0
diff --git a/metadata/md5-cache/acct-group/sispmctl-0 b/metadata/md5-cache/acct-group/sispmctl-0
index 8b564763a95e..7a047d06bd47 100644
--- a/metadata/md5-cache/acct-group/sispmctl-0
+++ b/metadata/md5-cache/acct-group/sispmctl-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5001dcc42f138a1a6865e9cd7d166308
diff --git a/metadata/md5-cache/acct-group/sks-0 b/metadata/md5-cache/acct-group/sks-0
index 1c5d44708092..c8b0e3183ee6 100644
--- a/metadata/md5-cache/acct-group/sks-0
+++ b/metadata/md5-cache/acct-group/sks-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=815b171407bae45f6793dddd56fbd294
diff --git a/metadata/md5-cache/acct-group/slurm-0-r1 b/metadata/md5-cache/acct-group/slurm-0-r1
index 315836e7951d..253a02e41082 100644
--- a/metadata/md5-cache/acct-group/slurm-0-r1
+++ b/metadata/md5-cache/acct-group/slurm-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=200bff04e3dd60b7329c07b1f3e9531e
diff --git a/metadata/md5-cache/acct-group/smmsp-0-r1 b/metadata/md5-cache/acct-group/smmsp-0-r1
index 6f603c3210c5..34ea0340bbc4 100644
--- a/metadata/md5-cache/acct-group/smmsp-0-r1
+++ b/metadata/md5-cache/acct-group/smmsp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc4a510367ca52dc2a7d3aae3ca9be57
diff --git a/metadata/md5-cache/acct-group/smokeping-0 b/metadata/md5-cache/acct-group/smokeping-0
index 45b291d1667e..742ba55eb746 100644
--- a/metadata/md5-cache/acct-group/smokeping-0
+++ b/metadata/md5-cache/acct-group/smokeping-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=540b8be3789b1255453122826ad9cf80
diff --git a/metadata/md5-cache/acct-group/sms-0 b/metadata/md5-cache/acct-group/sms-0
index 4c90364ef86e..02b9df8bfd81 100644
--- a/metadata/md5-cache/acct-group/sms-0
+++ b/metadata/md5-cache/acct-group/sms-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fae06c989afc33f3f6fa87d3942cb493
diff --git a/metadata/md5-cache/acct-group/smtpd-0-r1 b/metadata/md5-cache/acct-group/smtpd-0-r1
index 86e2c051fd5b..d616ed48da08 100644
--- a/metadata/md5-cache/acct-group/smtpd-0-r1
+++ b/metadata/md5-cache/acct-group/smtpd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c30685a7882b878d64668f0bfd9cc15c
diff --git a/metadata/md5-cache/acct-group/smtpq-0-r1 b/metadata/md5-cache/acct-group/smtpq-0-r1
index 942e7b8cc8a8..838f897d8bd8 100644
--- a/metadata/md5-cache/acct-group/smtpq-0-r1
+++ b/metadata/md5-cache/acct-group/smtpq-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f833d30e72519019b0761d9c895c03ac
diff --git a/metadata/md5-cache/acct-group/snapserver-0 b/metadata/md5-cache/acct-group/snapserver-0
index 27b9d1ad51e2..d9dba23ebc8e 100644
--- a/metadata/md5-cache/acct-group/snapserver-0
+++ b/metadata/md5-cache/acct-group/snapserver-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=37d3b8fdb49dcc3e7311498e5e66bba1
diff --git a/metadata/md5-cache/acct-group/sniproxy-0 b/metadata/md5-cache/acct-group/sniproxy-0
index f09cee88724d..8787d9b7e834 100644
--- a/metadata/md5-cache/acct-group/sniproxy-0
+++ b/metadata/md5-cache/acct-group/sniproxy-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8a3e5a7030b2dd9512ed57773312b131
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0 b/metadata/md5-cache/acct-group/snmp_exporter-0
index fd2d9ce84546..45fcac087e5c 100644
--- a/metadata/md5-cache/acct-group/snmp_exporter-0
+++ b/metadata/md5-cache/acct-group/snmp_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=51beb02be8623452b80e8860639fcb6b
diff --git a/metadata/md5-cache/acct-group/snort-0 b/metadata/md5-cache/acct-group/snort-0
index 23f4955b0e76..88b09e824afc 100644
--- a/metadata/md5-cache/acct-group/snort-0
+++ b/metadata/md5-cache/acct-group/snort-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7db8eab239d794136865bcd191626d08
diff --git a/metadata/md5-cache/acct-group/sobby-0 b/metadata/md5-cache/acct-group/sobby-0
index a840b33088b4..4f36b1f7d562 100644
--- a/metadata/md5-cache/acct-group/sobby-0
+++ b/metadata/md5-cache/acct-group/sobby-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1e5d800430e87029fc8f3f84adb9ffb8
diff --git a/metadata/md5-cache/acct-group/sobexsrv-0 b/metadata/md5-cache/acct-group/sobexsrv-0
index 324e84d9a4d9..7a9f7fb76380 100644
--- a/metadata/md5-cache/acct-group/sobexsrv-0
+++ b/metadata/md5-cache/acct-group/sobexsrv-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=01332fcd3786d84a772dfb9b17f46c96
diff --git a/metadata/md5-cache/acct-group/sockd-0 b/metadata/md5-cache/acct-group/sockd-0
index e6a7eebf672e..636da37de10d 100644
--- a/metadata/md5-cache/acct-group/sockd-0
+++ b/metadata/md5-cache/acct-group/sockd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b8bb4665b90241b1885ab397fa7df552
diff --git a/metadata/md5-cache/acct-group/sogo-0-r1 b/metadata/md5-cache/acct-group/sogo-0-r1
index 00b918a5f3b4..80735c05b5e4 100644
--- a/metadata/md5-cache/acct-group/sogo-0-r1
+++ b/metadata/md5-cache/acct-group/sogo-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0fb1f49c79336edc7fc0317f9099021e
diff --git a/metadata/md5-cache/acct-group/spamd-0-r1 b/metadata/md5-cache/acct-group/spamd-0-r1
index d0fd230367af..327a80c91d7d 100644
--- a/metadata/md5-cache/acct-group/spamd-0-r1
+++ b/metadata/md5-cache/acct-group/spamd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6b8b3cbe6e7e5e125ce497dfa33f6757
diff --git a/metadata/md5-cache/acct-group/spectrum-0-r1 b/metadata/md5-cache/acct-group/spectrum-0-r1
index 5a62c7463d92..81bce64f7d06 100644
--- a/metadata/md5-cache/acct-group/spectrum-0-r1
+++ b/metadata/md5-cache/acct-group/spectrum-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ad09b3c14319af729ccebba016305905
diff --git a/metadata/md5-cache/acct-group/spi-0 b/metadata/md5-cache/acct-group/spi-0
index 6145f7ab794d..efcc79cf29ec 100644
--- a/metadata/md5-cache/acct-group/spi-0
+++ b/metadata/md5-cache/acct-group/spi-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2f6307dd3c5e486b883a85a82e407f10
diff --git a/metadata/md5-cache/acct-group/spire-0-r1 b/metadata/md5-cache/acct-group/spire-0-r1
index a0a5ea716c22..c7c7bbc84ddc 100644
--- a/metadata/md5-cache/acct-group/spire-0-r1
+++ b/metadata/md5-cache/acct-group/spire-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0130c16e45708d789172c311440a2efe
diff --git a/metadata/md5-cache/acct-group/spread-0 b/metadata/md5-cache/acct-group/spread-0
index 3c55c632c6b7..efcfef92baa4 100644
--- a/metadata/md5-cache/acct-group/spread-0
+++ b/metadata/md5-cache/acct-group/spread-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=176f32600aa265111b8437f687601eeb
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0-r1 b/metadata/md5-cache/acct-group/sqlgrey-0-r1
index 2783c876939d..8285a595bf48 100644
--- a/metadata/md5-cache/acct-group/sqlgrey-0-r1
+++ b/metadata/md5-cache/acct-group/sqlgrey-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=82a58945cb41c1a5e372fc75e6502a45
diff --git a/metadata/md5-cache/acct-group/squid-0-r1 b/metadata/md5-cache/acct-group/squid-0-r1
index 533f63545feb..5fa091474a76 100644
--- a/metadata/md5-cache/acct-group/squid-0-r1
+++ b/metadata/md5-cache/acct-group/squid-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d62ae3398b0ef61de754e048c9483274
diff --git a/metadata/md5-cache/acct-group/sshd-0-r1 b/metadata/md5-cache/acct-group/sshd-0-r1
index 6c567ab46690..f8a700b3f615 100644
--- a/metadata/md5-cache/acct-group/sshd-0-r1
+++ b/metadata/md5-cache/acct-group/sshd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=806fe511e66eff6943cb9b40e5f0d87a
diff --git a/metadata/md5-cache/acct-group/ssmtp-0 b/metadata/md5-cache/acct-group/ssmtp-0
index 50b2d13689b1..3e016ffd5ef9 100644
--- a/metadata/md5-cache/acct-group/ssmtp-0
+++ b/metadata/md5-cache/acct-group/ssmtp-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=704d0afbb739dc380a99e2e148670b66
diff --git a/metadata/md5-cache/acct-group/sstpc-0 b/metadata/md5-cache/acct-group/sstpc-0
index abf331aa25d1..46d35bbb8b71 100644
--- a/metadata/md5-cache/acct-group/sstpc-0
+++ b/metadata/md5-cache/acct-group/sstpc-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=85c7cdd937cb7ea9e35072bedd3271de
diff --git a/metadata/md5-cache/acct-group/stapdev-0 b/metadata/md5-cache/acct-group/stapdev-0
index d483ec444948..e29ea0a6f007 100644
--- a/metadata/md5-cache/acct-group/stapdev-0
+++ b/metadata/md5-cache/acct-group/stapdev-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cb275a24c0b55db3af42aace2819ee77
diff --git a/metadata/md5-cache/acct-group/stapsys-0 b/metadata/md5-cache/acct-group/stapsys-0
index e7db38e9f406..9e999180b006 100644
--- a/metadata/md5-cache/acct-group/stapsys-0
+++ b/metadata/md5-cache/acct-group/stapsys-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6731407934553c09dba5a751a7e9e22a
diff --git a/metadata/md5-cache/acct-group/stapusr-0 b/metadata/md5-cache/acct-group/stapusr-0
index f6aa7f7c3e0b..78c9b1f3f006 100644
--- a/metadata/md5-cache/acct-group/stapusr-0
+++ b/metadata/md5-cache/acct-group/stapusr-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a29e35617b88a2d27c472c7f14e8bd44
diff --git a/metadata/md5-cache/acct-group/steamcmd-0-r1 b/metadata/md5-cache/acct-group/steamcmd-0-r1
index 220837e6181c..bb5e8607b911 100644
--- a/metadata/md5-cache/acct-group/steamcmd-0-r1
+++ b/metadata/md5-cache/acct-group/steamcmd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6a923e168552bdf12093a4773350247c
diff --git a/metadata/md5-cache/acct-group/stg-0 b/metadata/md5-cache/acct-group/stg-0
index c1b089932b4e..10ba41ca7f97 100644
--- a/metadata/md5-cache/acct-group/stg-0
+++ b/metadata/md5-cache/acct-group/stg-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9b35921181c9e1e6d2bd2b0c68a89c6f
diff --git a/metadata/md5-cache/acct-group/stubby-0-r1 b/metadata/md5-cache/acct-group/stubby-0-r1
index b06bccf5d12e..5c21953a2696 100644
--- a/metadata/md5-cache/acct-group/stubby-0-r1
+++ b/metadata/md5-cache/acct-group/stubby-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3480ad0dba45926b094caadc8a7d5a08
diff --git a/metadata/md5-cache/acct-group/stunnel-0-r1 b/metadata/md5-cache/acct-group/stunnel-0-r1
index 45aaeee5efb7..3efc27e2d58c 100644
--- a/metadata/md5-cache/acct-group/stunnel-0-r1
+++ b/metadata/md5-cache/acct-group/stunnel-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6c6fb56811775f25e3e837c556bc8740
diff --git a/metadata/md5-cache/acct-group/subsonic-0 b/metadata/md5-cache/acct-group/subsonic-0
index 1a095dd61b21..d2cd0c9b041d 100644
--- a/metadata/md5-cache/acct-group/subsonic-0
+++ b/metadata/md5-cache/acct-group/subsonic-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b432ae97f685dd50347a0f56cfc88160
diff --git a/metadata/md5-cache/acct-group/supervisor-0-r1 b/metadata/md5-cache/acct-group/supervisor-0-r1
index 0fb05ace3518..c509b099129b 100644
--- a/metadata/md5-cache/acct-group/supervisor-0-r1
+++ b/metadata/md5-cache/acct-group/supervisor-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4868066b65149da6442e753aac8a4f64
diff --git a/metadata/md5-cache/acct-group/suricata-0-r1 b/metadata/md5-cache/acct-group/suricata-0-r1
index 64a795a6c77d..b85d9b73058b 100644
--- a/metadata/md5-cache/acct-group/suricata-0-r1
+++ b/metadata/md5-cache/acct-group/suricata-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8b99a189e23956212f10ac0e2f3780fb
diff --git a/metadata/md5-cache/acct-group/svnusers-0-r1 b/metadata/md5-cache/acct-group/svnusers-0-r1
index cabbea2660b8..05a2a0101c8d 100644
--- a/metadata/md5-cache/acct-group/svnusers-0-r1
+++ b/metadata/md5-cache/acct-group/svnusers-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a814f58df7fb230948728e7d3f84dddc
diff --git a/metadata/md5-cache/acct-group/svxlink-0 b/metadata/md5-cache/acct-group/svxlink-0
index 9e6c375c6941..eb303bfac35a 100644
--- a/metadata/md5-cache/acct-group/svxlink-0
+++ b/metadata/md5-cache/acct-group/svxlink-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=de54ffa409b50b364b98f8527c631b3c
diff --git a/metadata/md5-cache/acct-group/swift-0-r1 b/metadata/md5-cache/acct-group/swift-0-r1
index 6b63572fcd1b..f14f17b42eba 100644
--- a/metadata/md5-cache/acct-group/swift-0-r1
+++ b/metadata/md5-cache/acct-group/swift-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f85c78533012f1083d50060e1809ee47
diff --git a/metadata/md5-cache/acct-group/synapse-0 b/metadata/md5-cache/acct-group/synapse-0
new file mode 100644
index 000000000000..9f2073411754
--- /dev/null
+++ b/metadata/md5-cache/acct-group/synapse-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-im/synapse
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
+SLOT=0
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=2f3f4cb5a37a6c6267a0b0770330f283
diff --git a/metadata/md5-cache/acct-group/syncthing-0-r1 b/metadata/md5-cache/acct-group/syncthing-0-r1
index 6db4abe51f13..c6614e6d8981 100644
--- a/metadata/md5-cache/acct-group/syncthing-0-r1
+++ b/metadata/md5-cache/acct-group/syncthing-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c5f5629f555e17b67f5761a82885e06
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0-r1 b/metadata/md5-cache/acct-group/systemd-coredump-0-r1
index b3dbb861ab35..58d686923822 100644
--- a/metadata/md5-cache/acct-group/systemd-coredump-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=098f56a8a84ab732bbee583483a1a3c7
diff --git a/metadata/md5-cache/acct-group/systemd-hostname-0-r1 b/metadata/md5-cache/acct-group/systemd-hostname-0-r1
index b7f1703eaf1c..7ed875b4b7a3 100644
--- a/metadata/md5-cache/acct-group/systemd-hostname-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-hostname-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=80ff187fafd841c86e3f8186ab8d62df
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0-r1 b/metadata/md5-cache/acct-group/systemd-journal-0-r1
index 0fb432ff0f58..2306d2e2ff71 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-journal-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=85d673f98186dc95b161e2717367d657
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1 b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
index 4c2f3f28bfd2..abb797fe695d 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=81478f2d56b5613e7afa7b56fff6a5ba
diff --git a/metadata/md5-cache/acct-group/systemd-network-0-r1 b/metadata/md5-cache/acct-group/systemd-network-0-r1
index 45dd6f7c43fa..2383e1cc4c52 100644
--- a/metadata/md5-cache/acct-group/systemd-network-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-network-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0be9a3b6e0b9f7df81f931600aee7370
diff --git a/metadata/md5-cache/acct-group/systemd-oom-0 b/metadata/md5-cache/acct-group/systemd-oom-0
index 7cb710edeea4..bead925aaed4 100644
--- a/metadata/md5-cache/acct-group/systemd-oom-0
+++ b/metadata/md5-cache/acct-group/systemd-oom-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f9cc7caff17c876ea0b331e762d8e131
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0-r1 b/metadata/md5-cache/acct-group/systemd-resolve-0-r1
index ba8937aae88f..288710cd361e 100644
--- a/metadata/md5-cache/acct-group/systemd-resolve-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3a07823982066aa8d38db7d02618112a
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0-r1 b/metadata/md5-cache/acct-group/systemd-timesync-0-r1
index 2bf99aed72c1..1ac34918aab2 100644
--- a/metadata/md5-cache/acct-group/systemd-timesync-0-r1
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e2c43cdf4137ec8f395bf286d3a48527
diff --git a/metadata/md5-cache/acct-group/tape-0-r1 b/metadata/md5-cache/acct-group/tape-0-r1
index a077fe6282df..29aac899fb04 100644
--- a/metadata/md5-cache/acct-group/tape-0-r1
+++ b/metadata/md5-cache/acct-group/tape-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=86242ad94ac294b6bf673f2091c83e5a
diff --git a/metadata/md5-cache/acct-group/taskd-0 b/metadata/md5-cache/acct-group/taskd-0
index 34027de9dcd7..8819d63ace33 100644
--- a/metadata/md5-cache/acct-group/taskd-0
+++ b/metadata/md5-cache/acct-group/taskd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5d67c76f91bced5e03ecabf19a9fa23b
diff --git a/metadata/md5-cache/acct-group/teamspeak-0-r1 b/metadata/md5-cache/acct-group/teamspeak-0-r1
index 1b1940f1160c..c28d2509816c 100644
--- a/metadata/md5-cache/acct-group/teamspeak-0-r1
+++ b/metadata/md5-cache/acct-group/teamspeak-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=311108f9c2c5239074a46622df319ffb
diff --git a/metadata/md5-cache/acct-group/telegraf-0-r1 b/metadata/md5-cache/acct-group/telegraf-0-r1
index 9c609f244103..4396bafe63dd 100644
--- a/metadata/md5-cache/acct-group/telegraf-0-r1
+++ b/metadata/md5-cache/acct-group/telegraf-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d7fee1e42b2bd162089d2dd2b97b2861
diff --git a/metadata/md5-cache/acct-group/tenshi-0 b/metadata/md5-cache/acct-group/tenshi-0
index 1b7ef2edcc39..4323c9d5351f 100644
--- a/metadata/md5-cache/acct-group/tenshi-0
+++ b/metadata/md5-cache/acct-group/tenshi-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bd1f2bdd1c284d67c28f0e43c148848c
diff --git a/metadata/md5-cache/acct-group/thttpd-0 b/metadata/md5-cache/acct-group/thttpd-0
index aa1e64b46f8e..661107272b23 100644
--- a/metadata/md5-cache/acct-group/thttpd-0
+++ b/metadata/md5-cache/acct-group/thttpd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=56cb00c84de67a6080110a569e0a2506
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0 b/metadata/md5-cache/acct-group/tinyproxy-0
index 62f367ee2770..9efdf5843353 100644
--- a/metadata/md5-cache/acct-group/tinyproxy-0
+++ b/metadata/md5-cache/acct-group/tinyproxy-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d2940ffb6c6a7dc0b9037911b31ab0f2
diff --git a/metadata/md5-cache/acct-group/tomcat-0 b/metadata/md5-cache/acct-group/tomcat-0
index a59592851e4f..8a260936f7b1 100644
--- a/metadata/md5-cache/acct-group/tomcat-0
+++ b/metadata/md5-cache/acct-group/tomcat-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=22d8c3118d771295733382825aa69ef1
diff --git a/metadata/md5-cache/acct-group/tor-0-r1 b/metadata/md5-cache/acct-group/tor-0-r1
index 414046bca4b1..aa458986bacf 100644
--- a/metadata/md5-cache/acct-group/tor-0-r1
+++ b/metadata/md5-cache/acct-group/tor-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=525c6654cf951260d81329c7482f63cd
diff --git a/metadata/md5-cache/acct-group/tox-0-r1 b/metadata/md5-cache/acct-group/tox-0-r1
index 66b318569939..3d33ebe2f696 100644
--- a/metadata/md5-cache/acct-group/tox-0-r1
+++ b/metadata/md5-cache/acct-group/tox-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=744a69462c60b4797367a6b94ce1cef2
diff --git a/metadata/md5-cache/acct-group/tpm-0 b/metadata/md5-cache/acct-group/tpm-0
index 213e7988c785..585d7bb3c082 100644
--- a/metadata/md5-cache/acct-group/tpm-0
+++ b/metadata/md5-cache/acct-group/tpm-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=754bdc41179dbc03b1f873372575532b
diff --git a/metadata/md5-cache/acct-group/transmission-0-r1 b/metadata/md5-cache/acct-group/transmission-0-r1
index 9d1c109fdf54..17f41c6f83e3 100644
--- a/metadata/md5-cache/acct-group/transmission-0-r1
+++ b/metadata/md5-cache/acct-group/transmission-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c96b703440173ab7e8832355cd4476d
diff --git a/metadata/md5-cache/acct-group/trickster-0 b/metadata/md5-cache/acct-group/trickster-0
index 71ea5500ae33..f3feb7998799 100644
--- a/metadata/md5-cache/acct-group/trickster-0
+++ b/metadata/md5-cache/acct-group/trickster-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a3c348cc69eb3da6e13665dbce8f49ee
diff --git a/metadata/md5-cache/acct-group/trojan-0 b/metadata/md5-cache/acct-group/trojan-0
index f1ee157dd0ee..16b77020a39a 100644
--- a/metadata/md5-cache/acct-group/trojan-0
+++ b/metadata/md5-cache/acct-group/trojan-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c91f3b464dda076c467a3c9ee6c15672
diff --git a/metadata/md5-cache/acct-group/tsm-0-r1 b/metadata/md5-cache/acct-group/tsm-0-r1
index 3904044e1bd3..c54b0c71bb50 100644
--- a/metadata/md5-cache/acct-group/tsm-0-r1
+++ b/metadata/md5-cache/acct-group/tsm-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=127a3f7ff62856c6e9daf5b12e210dae
diff --git a/metadata/md5-cache/acct-group/tss-0-r1 b/metadata/md5-cache/acct-group/tss-0-r1
index 151b064e92ed..59023ba21516 100644
--- a/metadata/md5-cache/acct-group/tss-0-r1
+++ b/metadata/md5-cache/acct-group/tss-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ef98d714d41b1a6780c988c5485153ed
diff --git a/metadata/md5-cache/acct-group/ttrssd-0 b/metadata/md5-cache/acct-group/ttrssd-0
index 5c19c476e802..7d343643420f 100644
--- a/metadata/md5-cache/acct-group/ttrssd-0
+++ b/metadata/md5-cache/acct-group/ttrssd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=30a76ee0967a01d72c9dfb92b0c4178e
diff --git a/metadata/md5-cache/acct-group/tty-0-r1 b/metadata/md5-cache/acct-group/tty-0-r1
index 0b35fd032d2c..af39147dd102 100644
--- a/metadata/md5-cache/acct-group/tty-0-r1
+++ b/metadata/md5-cache/acct-group/tty-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=27b44f68d2a4849fe618b62c8a51f543
diff --git a/metadata/md5-cache/acct-group/turnserver-0-r1 b/metadata/md5-cache/acct-group/turnserver-0-r1
index f720a5ea815e..bf026f66145f 100644
--- a/metadata/md5-cache/acct-group/turnserver-0-r1
+++ b/metadata/md5-cache/acct-group/turnserver-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=420f0043feaf030bdfe8c952a308746e
diff --git a/metadata/md5-cache/acct-group/ubridge-0-r1 b/metadata/md5-cache/acct-group/ubridge-0-r1
index 894d67302896..c95d3e0bc2e5 100644
--- a/metadata/md5-cache/acct-group/ubridge-0-r1
+++ b/metadata/md5-cache/acct-group/ubridge-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d463fe93296e3ead8f2bf93b628435b7
diff --git a/metadata/md5-cache/acct-group/ulogd-0 b/metadata/md5-cache/acct-group/ulogd-0
index 20841ca0a193..0e6f4a8e7b2c 100644
--- a/metadata/md5-cache/acct-group/ulogd-0
+++ b/metadata/md5-cache/acct-group/ulogd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=694940cef46e3c004f8f129b48093a81
diff --git a/metadata/md5-cache/acct-group/ultimaker-0-r1 b/metadata/md5-cache/acct-group/ultimaker-0-r1
index 11b69543029a..973c4b2783e1 100644
--- a/metadata/md5-cache/acct-group/ultimaker-0-r1
+++ b/metadata/md5-cache/acct-group/ultimaker-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=64cee0374ba41d41097cfa02551c36a6
diff --git a/metadata/md5-cache/acct-group/unbound-0-r1 b/metadata/md5-cache/acct-group/unbound-0-r1
index bb6236a7958d..7a355e604932 100644
--- a/metadata/md5-cache/acct-group/unbound-0-r1
+++ b/metadata/md5-cache/acct-group/unbound-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e62c3e46bec14e7a187a04499caa6be6
diff --git a/metadata/md5-cache/acct-group/unbound-telemetry-0 b/metadata/md5-cache/acct-group/unbound-telemetry-0
index 2a500a626170..c2bdfb66b3f8 100644
--- a/metadata/md5-cache/acct-group/unbound-telemetry-0
+++ b/metadata/md5-cache/acct-group/unbound-telemetry-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f58506b213491a1b36da7ba8eb7207b5
diff --git a/metadata/md5-cache/acct-group/unifi-0-r1 b/metadata/md5-cache/acct-group/unifi-0-r1
index d480b96dd3d4..85ffbc0621e1 100644
--- a/metadata/md5-cache/acct-group/unifi-0-r1
+++ b/metadata/md5-cache/acct-group/unifi-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=96fd1e11ea88d29018d4c6b3911632ee
diff --git a/metadata/md5-cache/acct-group/unifi-video-0 b/metadata/md5-cache/acct-group/unifi-video-0
index 2bd38d18f1ab..67ebb16ee66f 100644
--- a/metadata/md5-cache/acct-group/unifi-video-0
+++ b/metadata/md5-cache/acct-group/unifi-video-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=15790b55684f0ce80a9f766a911d52cb
diff --git a/metadata/md5-cache/acct-group/unrealircd-0-r1 b/metadata/md5-cache/acct-group/unrealircd-0-r1
index fa89483e1713..3823a35b36de 100644
--- a/metadata/md5-cache/acct-group/unrealircd-0-r1
+++ b/metadata/md5-cache/acct-group/unrealircd-0-r1
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=332826d88877c4b7cf63801975692826
diff --git a/metadata/md5-cache/acct-group/upmpdcli-0 b/metadata/md5-cache/acct-group/upmpdcli-0
index 88b8a54f7d62..93397314b16e 100644
--- a/metadata/md5-cache/acct-group/upmpdcli-0
+++ b/metadata/md5-cache/acct-group/upmpdcli-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=98b7d2b1f7a08f21bfbaa06255913c62
diff --git a/metadata/md5-cache/acct-group/uptimed-0-r2 b/metadata/md5-cache/acct-group/uptimed-0-r2
index 00cc668656cf..c9a8143ae70a 100644
--- a/metadata/md5-cache/acct-group/uptimed-0-r2
+++ b/metadata/md5-cache/acct-group/uptimed-0-r2
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=800dbbf05ba8a1fe41117be5550c16ca
diff --git a/metadata/md5-cache/acct-group/usb-0-r1 b/metadata/md5-cache/acct-group/usb-0-r1
index fb42b36736e2..8725e5e53042 100644
--- a/metadata/md5-cache/acct-group/usb-0-r1
+++ b/metadata/md5-cache/acct-group/usb-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9b830fe958385f19197b60db5157c4af
diff --git a/metadata/md5-cache/acct-group/users-0 b/metadata/md5-cache/acct-group/users-0
index 9dd2947a4e87..1202629c045d 100644
--- a/metadata/md5-cache/acct-group/users-0
+++ b/metadata/md5-cache/acct-group/users-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c8f2f31048f3de1fa53421ddd43ecdda
diff --git a/metadata/md5-cache/acct-group/ushare-0 b/metadata/md5-cache/acct-group/ushare-0
index 6eeb3da9b94b..e218648d685f 100644
--- a/metadata/md5-cache/acct-group/ushare-0
+++ b/metadata/md5-cache/acct-group/ushare-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3395b7fe27f872333dd11ade8ca5075f
diff --git a/metadata/md5-cache/acct-group/utmp-0-r1 b/metadata/md5-cache/acct-group/utmp-0-r1
index c8889581b3ce..81e624f74915 100644
--- a/metadata/md5-cache/acct-group/utmp-0-r1
+++ b/metadata/md5-cache/acct-group/utmp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3f7fe5b7f11e59a9d8d4955f4bb1b95a
diff --git a/metadata/md5-cache/acct-group/uucp-0-r1 b/metadata/md5-cache/acct-group/uucp-0-r1
index 7a4c58bd1cc9..557b18094057 100644
--- a/metadata/md5-cache/acct-group/uucp-0-r1
+++ b/metadata/md5-cache/acct-group/uucp-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6b9a4f0f2f0c0a26c2ddf6da7529eb4d
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0 b/metadata/md5-cache/acct-group/uwsgi_exporter-0
index 8eb9c739a176..8feea39779da 100644
--- a/metadata/md5-cache/acct-group/uwsgi_exporter-0
+++ b/metadata/md5-cache/acct-group/uwsgi_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fc7a036f684f9e4995ce90094a6672fb
diff --git a/metadata/md5-cache/acct-group/vacation-0 b/metadata/md5-cache/acct-group/vacation-0
index 435269837f76..c703fba197b0 100644
--- a/metadata/md5-cache/acct-group/vacation-0
+++ b/metadata/md5-cache/acct-group/vacation-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7441efdb18b7361bb94c6172dc07899e
diff --git a/metadata/md5-cache/acct-group/varnish-0-r1 b/metadata/md5-cache/acct-group/varnish-0-r1
index 6c276d0cc847..880b00583a2f 100644
--- a/metadata/md5-cache/acct-group/varnish-0-r1
+++ b/metadata/md5-cache/acct-group/varnish-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=550524133d62be9df27e5631e3e740d1
diff --git a/metadata/md5-cache/acct-group/vault-0-r1 b/metadata/md5-cache/acct-group/vault-0-r1
index f3db17a55da8..ad5cfcf321d6 100644
--- a/metadata/md5-cache/acct-group/vault-0-r1
+++ b/metadata/md5-cache/acct-group/vault-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=739ba25f8da21b5046773324a790d59f
diff --git a/metadata/md5-cache/acct-group/vault_exporter-0 b/metadata/md5-cache/acct-group/vault_exporter-0
index 54f67cb51eb8..e975679ca727 100644
--- a/metadata/md5-cache/acct-group/vault_exporter-0
+++ b/metadata/md5-cache/acct-group/vault_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4f8b246ea59f49285df9b9a6d5dd2ccc
diff --git a/metadata/md5-cache/acct-group/vboxguest-0-r1 b/metadata/md5-cache/acct-group/vboxguest-0-r1
index 256b5097eeef..dc6127dec0d2 100644
--- a/metadata/md5-cache/acct-group/vboxguest-0-r1
+++ b/metadata/md5-cache/acct-group/vboxguest-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b47bd0cfe04a7a4568a89753b589fe96
diff --git a/metadata/md5-cache/acct-group/vboxsf-0-r1 b/metadata/md5-cache/acct-group/vboxsf-0-r1
index 97d1f4e7f643..7db85bceb731 100644
--- a/metadata/md5-cache/acct-group/vboxsf-0-r1
+++ b/metadata/md5-cache/acct-group/vboxsf-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d94845e030150651a42d0676b2bd4f15
diff --git a/metadata/md5-cache/acct-group/vboxusers-0-r1 b/metadata/md5-cache/acct-group/vboxusers-0-r1
index 8f68f1fd0161..571a82ef574b 100644
--- a/metadata/md5-cache/acct-group/vboxusers-0-r1
+++ b/metadata/md5-cache/acct-group/vboxusers-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=af450b3b401ee9050aff2680ae05611f
diff --git a/metadata/md5-cache/acct-group/vdr-0-r1 b/metadata/md5-cache/acct-group/vdr-0-r1
index 42877e8776a5..1d4fcaca4b1b 100644
--- a/metadata/md5-cache/acct-group/vdr-0-r1
+++ b/metadata/md5-cache/acct-group/vdr-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2b8b353d128e19962bc22c07ad0c5fc8
diff --git a/metadata/md5-cache/acct-group/vdradmin-0-r1 b/metadata/md5-cache/acct-group/vdradmin-0-r1
index 705a1afc732c..04ffa89bd94d 100644
--- a/metadata/md5-cache/acct-group/vdradmin-0-r1
+++ b/metadata/md5-cache/acct-group/vdradmin-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=47f66ef04bd861405089b35b10fd7db0
diff --git a/metadata/md5-cache/acct-group/video-0-r1 b/metadata/md5-cache/acct-group/video-0-r1
index b52cf9ed8040..9e8417b7ca21 100644
--- a/metadata/md5-cache/acct-group/video-0-r1
+++ b/metadata/md5-cache/acct-group/video-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4b2e9a61d260463a29582ee18c48e1c5
diff --git a/metadata/md5-cache/acct-group/vlock-0 b/metadata/md5-cache/acct-group/vlock-0
index b5eeb2f95551..8549b8bb76a5 100644
--- a/metadata/md5-cache/acct-group/vlock-0
+++ b/metadata/md5-cache/acct-group/vlock-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6af78bc4aa7fed96164626ede04fffd9
diff --git a/metadata/md5-cache/acct-group/vnstat-0 b/metadata/md5-cache/acct-group/vnstat-0
index c295aa67d110..3c6d9d1a0784 100644
--- a/metadata/md5-cache/acct-group/vnstat-0
+++ b/metadata/md5-cache/acct-group/vnstat-0
@@ -4,5 +4,5 @@ EAPI=8
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=09d7ebd5503cea35c1dd75bcbbaa4824
diff --git a/metadata/md5-cache/acct-group/vpopmail-0-r1 b/metadata/md5-cache/acct-group/vpopmail-0-r1
index de68cb9443ec..d95e94411d8e 100644
--- a/metadata/md5-cache/acct-group/vpopmail-0-r1
+++ b/metadata/md5-cache/acct-group/vpopmail-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=082e748a5e28591c268a236379ddcc62
diff --git a/metadata/md5-cache/acct-group/wesnoth-0-r1 b/metadata/md5-cache/acct-group/wesnoth-0-r1
index 9c93bac6e848..f9375911d158 100644
--- a/metadata/md5-cache/acct-group/wesnoth-0-r1
+++ b/metadata/md5-cache/acct-group/wesnoth-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cb4f74bd45e2f277cd82ecd415e13ede
diff --git a/metadata/md5-cache/acct-group/wheel-0-r1 b/metadata/md5-cache/acct-group/wheel-0-r1
index 60207f3a65ff..0d79d7c4cb03 100644
--- a/metadata/md5-cache/acct-group/wheel-0-r1
+++ b/metadata/md5-cache/acct-group/wheel-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=23ea25efad05a48acc3ae75f79932a96
diff --git a/metadata/md5-cache/acct-group/wwwoffle-0 b/metadata/md5-cache/acct-group/wwwoffle-0
index 0227149f31dc..99bc7b61d16b 100644
--- a/metadata/md5-cache/acct-group/wwwoffle-0
+++ b/metadata/md5-cache/acct-group/wwwoffle-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6b17465873f6d99e4a1394890a621450
diff --git a/metadata/md5-cache/acct-group/x2goprint-0-r1 b/metadata/md5-cache/acct-group/x2goprint-0-r1
index 3248fb59c37f..39f5278b79d3 100644
--- a/metadata/md5-cache/acct-group/x2goprint-0-r1
+++ b/metadata/md5-cache/acct-group/x2goprint-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=72f1c211f7b064970bf4376370b53e6c
diff --git a/metadata/md5-cache/acct-group/x2gouser-0-r1 b/metadata/md5-cache/acct-group/x2gouser-0-r1
index a3aaf5d060f0..8083f89ca637 100644
--- a/metadata/md5-cache/acct-group/x2gouser-0-r1
+++ b/metadata/md5-cache/acct-group/x2gouser-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8f8e16dad237061c1e5f2b58f6333f8b
diff --git a/metadata/md5-cache/acct-group/xpra-0 b/metadata/md5-cache/acct-group/xpra-0
index 2727d0fcacb1..9511d5390a5f 100644
--- a/metadata/md5-cache/acct-group/xpra-0
+++ b/metadata/md5-cache/acct-group/xpra-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=909254e6f02205948a2190ecdb1ff3a9
diff --git a/metadata/md5-cache/acct-group/xrootd-0-r1 b/metadata/md5-cache/acct-group/xrootd-0-r1
index a70026c2ffc2..21734838884c 100644
--- a/metadata/md5-cache/acct-group/xrootd-0-r1
+++ b/metadata/md5-cache/acct-group/xrootd-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5f8b5871b332872a9a55361782a4b6e8
diff --git a/metadata/md5-cache/acct-group/xwax-0 b/metadata/md5-cache/acct-group/xwax-0
index 442f2a230ace..f4bc5397312a 100644
--- a/metadata/md5-cache/acct-group/xwax-0
+++ b/metadata/md5-cache/acct-group/xwax-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9bb374b6c0a8bc4913b64e0436585be0
diff --git a/metadata/md5-cache/acct-group/zabbix-0 b/metadata/md5-cache/acct-group/zabbix-0
index 96f197acf484..586ad276d879 100644
--- a/metadata/md5-cache/acct-group/zabbix-0
+++ b/metadata/md5-cache/acct-group/zabbix-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e5bccce5fd1cff14837041638da2f18
diff --git a/metadata/md5-cache/acct-group/zeppelin-0-r1 b/metadata/md5-cache/acct-group/zeppelin-0-r1
index 7dd168f5bf2f..2e43d307eaa5 100644
--- a/metadata/md5-cache/acct-group/zeppelin-0-r1
+++ b/metadata/md5-cache/acct-group/zeppelin-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=907730e5f277018a1895aff849313cca
diff --git a/metadata/md5-cache/acct-group/zetcd-0 b/metadata/md5-cache/acct-group/zetcd-0
index 8afa7b3d9285..c96406ecb70d 100644
--- a/metadata/md5-cache/acct-group/zetcd-0
+++ b/metadata/md5-cache/acct-group/zetcd-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=598749e7bac30e7c5093ed8e1b7ff25b
diff --git a/metadata/md5-cache/acct-group/ziproxy-0 b/metadata/md5-cache/acct-group/ziproxy-0
index 4e573c874242..bc596ae7cce4 100644
--- a/metadata/md5-cache/acct-group/ziproxy-0
+++ b/metadata/md5-cache/acct-group/ziproxy-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0df45d03f441d5b95c89b7928a2bb39a
diff --git a/metadata/md5-cache/acct-group/znc-0-r1 b/metadata/md5-cache/acct-group/znc-0-r1
index dc66c4b42f2e..ad8442b6d89f 100644
--- a/metadata/md5-cache/acct-group/znc-0-r1
+++ b/metadata/md5-cache/acct-group/znc-0-r1
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a61b18898abf1bdc18af3a609a3710f1
diff --git a/metadata/md5-cache/acct-group/zookeeper-0 b/metadata/md5-cache/acct-group/zookeeper-0
index bf2d9a1c30ff..ed4a67dc6adb 100644
--- a/metadata/md5-cache/acct-group/zookeeper-0
+++ b/metadata/md5-cache/acct-group/zookeeper-0
@@ -4,5 +4,5 @@ EAPI=7
 INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 SLOT=0
-_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fc55b413484bdb59251081a63151870f
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index ebb4f6773275..1ecb63f0fe76 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/abrt-0-r1 b/metadata/md5-cache/acct-user/abrt-0-r1
index 39d833bc7ff2..3572433b9353 100644
--- a/metadata/md5-cache/acct-user/abrt-0-r1
+++ b/metadata/md5-cache/acct-user/abrt-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/abrt
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=823011cb4f042265d3409b1a5d8b6664
diff --git a/metadata/md5-cache/acct-user/aerospike-amc-0 b/metadata/md5-cache/acct-user/aerospike-amc-0
index 3aed8db815b7..8103aa5f1ec4 100644
--- a/metadata/md5-cache/acct-user/aerospike-amc-0
+++ b/metadata/md5-cache/acct-user/aerospike-amc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/aerospike-amc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b8406c570ebdfcd2b452b1b8ad1b33f9
diff --git a/metadata/md5-cache/acct-user/airdcppd-0-r1 b/metadata/md5-cache/acct-user/airdcppd-0-r1
index ba1dc2c03dac..68799f6518b5 100644
--- a/metadata/md5-cache/acct-user/airdcppd-0-r1
+++ b/metadata/md5-cache/acct-user/airdcppd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/airdcppd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a44b5508e38d441f206536d9f3891bf9
diff --git a/metadata/md5-cache/acct-user/alertmanager-0 b/metadata/md5-cache/acct-user/alertmanager-0
index 351b572e5f41..d53f3982ce45 100644
--- a/metadata/md5-cache/acct-user/alertmanager-0
+++ b/metadata/md5-cache/acct-user/alertmanager-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/alertmanager
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=151d927d42fe6e2b64ae5f9f81de72d7
diff --git a/metadata/md5-cache/acct-user/alias-0-r1 b/metadata/md5-cache/acct-user/alias-0-r1
index aca9d0a0b2ad..d5509907d607 100644
--- a/metadata/md5-cache/acct-user/alias-0-r1
+++ b/metadata/md5-cache/acct-user/alias-0-r1
@@ -6,5 +6,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c92a5351a362ca55f079714ae95b0ab8
diff --git a/metadata/md5-cache/acct-user/amanda-0 b/metadata/md5-cache/acct-user/amanda-0
index c8c10ca12800..be4ead71c495 100644
--- a/metadata/md5-cache/acct-user/amanda-0
+++ b/metadata/md5-cache/acct-user/amanda-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/amanda
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d866b68c27368cf438c55cfe403c0a16
diff --git a/metadata/md5-cache/acct-user/amavis-0-r1 b/metadata/md5-cache/acct-user/amavis-0-r1
index 0d7893e930f8..52e724788cdb 100644
--- a/metadata/md5-cache/acct-user/amavis-0-r1
+++ b/metadata/md5-cache/acct-user/amavis-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/amavis
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=36b9eb6be154c3940075740b7d232587
diff --git a/metadata/md5-cache/acct-user/amule-0-r1 b/metadata/md5-cache/acct-user/amule-0-r2
similarity index 66%
rename from metadata/md5-cache/acct-user/amule-0-r1
rename to metadata/md5-cache/acct-user/amule-0-r2
index cef38e3d5f2e..54e8e87b746c 100644
--- a/metadata/md5-cache/acct-user/amule-0-r1
+++ b/metadata/md5-cache/acct-user/amule-0-r2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst preinst prerm pretend
 DESCRIPTION=User for net-p2p/amule
-EAPI=7
+EAPI=8
 INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/amule
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=d7602bcb3b8a44d7426c59f7d1ddd815
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=63b9e7e41e7cd23b290c22c1c0d4f310
diff --git a/metadata/md5-cache/acct-user/anope-0-r1 b/metadata/md5-cache/acct-user/anope-0-r1
index 105b29a2c0a6..8da8c12b88d5 100644
--- a/metadata/md5-cache/acct-user/anope-0-r1
+++ b/metadata/md5-cache/acct-user/anope-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/anope
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4bfc11e876a684b6548219612338e9df
diff --git a/metadata/md5-cache/acct-user/apache-0-r2 b/metadata/md5-cache/acct-user/apache-0-r2
index a6f5f31cd861..85dab84cbfb7 100644
--- a/metadata/md5-cache/acct-user/apache-0-r2
+++ b/metadata/md5-cache/acct-user/apache-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/apache
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0f642815b1a310a7a20131c8a8364a0c
diff --git a/metadata/md5-cache/acct-user/apt-cacher-ng-0 b/metadata/md5-cache/acct-user/apt-cacher-ng-0
index 0c834e2fa14c..140430aac33a 100644
--- a/metadata/md5-cache/acct-user/apt-cacher-ng-0
+++ b/metadata/md5-cache/acct-user/apt-cacher-ng-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/apt-cacher-ng
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8a5f809bc44d484ac8b8a2f449d31fb5
diff --git a/metadata/md5-cache/acct-user/argus-0 b/metadata/md5-cache/acct-user/argus-0
index 459c3c16b4ce..52cb22367084 100644
--- a/metadata/md5-cache/acct-user/argus-0
+++ b/metadata/md5-cache/acct-user/argus-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/argus
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=222da2d6369fda19a164f37e2584cb41
diff --git a/metadata/md5-cache/acct-user/arpwatch-0 b/metadata/md5-cache/acct-user/arpwatch-0
index bbaef8f054de..789d83bcc9c6 100644
--- a/metadata/md5-cache/acct-user/arpwatch-0
+++ b/metadata/md5-cache/acct-user/arpwatch-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/arpwatch
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4707c48563f39862fd0f9011e1980927
diff --git a/metadata/md5-cache/acct-user/artifactory-0 b/metadata/md5-cache/acct-user/artifactory-0
index c1ab846c15a8..156e466f29bb 100644
--- a/metadata/md5-cache/acct-user/artifactory-0
+++ b/metadata/md5-cache/acct-user/artifactory-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/artifactory
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e60384b5e0a0d7aa4ad92f9d55a15cab
diff --git a/metadata/md5-cache/acct-user/aspnet-0 b/metadata/md5-cache/acct-user/aspnet-0
index db2af86bae51..d62695238990 100644
--- a/metadata/md5-cache/acct-user/aspnet-0
+++ b/metadata/md5-cache/acct-user/aspnet-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/aspnet
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bfd7f0c86adac2e8e2e8c9d85fadffcf
diff --git a/metadata/md5-cache/acct-user/asterisk-0-r1 b/metadata/md5-cache/acct-user/asterisk-0-r1
index 9f656f8f1e3a..b793064e3399 100644
--- a/metadata/md5-cache/acct-user/asterisk-0-r1
+++ b/metadata/md5-cache/acct-user/asterisk-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/asterisk acct-group/dialout
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e0c1517d8b9cb7997b5dba3be7ce79d9
diff --git a/metadata/md5-cache/acct-user/at-0 b/metadata/md5-cache/acct-user/at-0
index 2d418cc10cb7..683e39fac100 100644
--- a/metadata/md5-cache/acct-user/at-0
+++ b/metadata/md5-cache/acct-user/at-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/at
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=21a239ba0e3008cec1bb7958bbb0c964
diff --git a/metadata/md5-cache/acct-user/atheme-services-0-r1 b/metadata/md5-cache/acct-user/atheme-services-0-r1
index 9b2fc97239e2..16f707fce9e5 100644
--- a/metadata/md5-cache/acct-user/atheme-services-0-r1
+++ b/metadata/md5-cache/acct-user/atheme-services-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/atheme-services
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2a52a8faf1acdc14224df657bc819117
diff --git a/metadata/md5-cache/acct-user/automatic-0 b/metadata/md5-cache/acct-user/automatic-0
index 6bc4f22e9562..7351c1a30f89 100644
--- a/metadata/md5-cache/acct-user/automatic-0
+++ b/metadata/md5-cache/acct-user/automatic-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/automatic
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e2036182f9e41f8ff875cd18ed4aaf70
diff --git a/metadata/md5-cache/acct-user/automx2-0-r1 b/metadata/md5-cache/acct-user/automx2-0-r1
index 8cd12276b124..3bea86baf3ad 100644
--- a/metadata/md5-cache/acct-user/automx2-0-r1
+++ b/metadata/md5-cache/acct-user/automx2-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/automx2
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1299f2f3ed6e4a9f91f04b3d234a27db
diff --git a/metadata/md5-cache/acct-user/avahi-0-r1 b/metadata/md5-cache/acct-user/avahi-0-r1
index 86ce3678f90a..99dcd06599cc 100644
--- a/metadata/md5-cache/acct-user/avahi-0-r1
+++ b/metadata/md5-cache/acct-user/avahi-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/avahi
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6301a4763510098216598ce82d83b460
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0-r1 b/metadata/md5-cache/acct-user/avahi-autoipd-0-r1
index 113fbc0d7bd6..d2706341a249 100644
--- a/metadata/md5-cache/acct-user/avahi-autoipd-0-r1
+++ b/metadata/md5-cache/acct-user/avahi-autoipd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/avahi-autoipd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7844d38f03ca170ca5ed5f1f1fe994b0
diff --git a/metadata/md5-cache/acct-user/axtls-0 b/metadata/md5-cache/acct-user/axtls-0
index 39d5c55c8464..fa5deac9c7d7 100644
--- a/metadata/md5-cache/acct-user/axtls-0
+++ b/metadata/md5-cache/acct-user/axtls-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/axtls
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=44cedc1e0721ae08d51b1514e8f287af
diff --git a/metadata/md5-cache/acct-user/backuppc-0 b/metadata/md5-cache/acct-user/backuppc-0
index d7b9f71c8876..82df117be694 100644
--- a/metadata/md5-cache/acct-user/backuppc-0
+++ b/metadata/md5-cache/acct-user/backuppc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/backuppc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=16a2f4e7c6e5e316494aac387f0d20a1
diff --git a/metadata/md5-cache/acct-user/bacula-0-r1 b/metadata/md5-cache/acct-user/bacula-0-r1
index 1d38dca52580..79686ac135ad 100644
--- a/metadata/md5-cache/acct-user/bacula-0-r1
+++ b/metadata/md5-cache/acct-user/bacula-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bacula acct-group/disk acct-group/tape acct-group/cdrom
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3a64c40848cc440659caf58cbf3d90ca
diff --git a/metadata/md5-cache/acct-user/bareos-0-r1 b/metadata/md5-cache/acct-user/bareos-0-r1
index f2a44c714af0..cfe1fa601e05 100644
--- a/metadata/md5-cache/acct-user/bareos-0-r1
+++ b/metadata/md5-cache/acct-user/bareos-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bareos acct-group/disk acct-group/tape acct-group/cdrom
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=75791ba57ff4099999fa2522064aaa19
diff --git a/metadata/md5-cache/acct-user/beanstalk-0 b/metadata/md5-cache/acct-user/beanstalk-0
index 187a77246b3a..a491781db8f9 100644
--- a/metadata/md5-cache/acct-user/beanstalk-0
+++ b/metadata/md5-cache/acct-user/beanstalk-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/beanstalk
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d428bab06befd35f4b2de7c601ee0f53
diff --git a/metadata/md5-cache/acct-user/bedrock-0-r1 b/metadata/md5-cache/acct-user/bedrock-0-r1
index 2d8434988336..b88929de7740 100644
--- a/metadata/md5-cache/acct-user/bedrock-0-r1
+++ b/metadata/md5-cache/acct-user/bedrock-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bedrock
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1f65d6c04dfe471f284ffe129e30ee09
diff --git a/metadata/md5-cache/acct-user/biboumi-0 b/metadata/md5-cache/acct-user/biboumi-0
index 304ee9e0e531..dc341cf6ebe2 100644
--- a/metadata/md5-cache/acct-user/biboumi-0
+++ b/metadata/md5-cache/acct-user/biboumi-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/biboumi
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b0a4737136b7d8c0719546359c5b07ee
diff --git a/metadata/md5-cache/acct-user/bind_exporter-0-r1 b/metadata/md5-cache/acct-user/bind_exporter-0-r1
index 7a0db0416a9f..5ca4ec07edb9 100644
--- a/metadata/md5-cache/acct-user/bind_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/bind_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bind_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d811040ae3c3a689ea52abb32cb463cf
diff --git a/metadata/md5-cache/acct-user/bird-0 b/metadata/md5-cache/acct-user/bird-0
index 185a6348b205..33984106f853 100644
--- a/metadata/md5-cache/acct-user/bird-0
+++ b/metadata/md5-cache/acct-user/bird-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bird
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=892d703c0ddb13ab2eb41b02b41612e8
diff --git a/metadata/md5-cache/acct-user/bitcoin-0-r1 b/metadata/md5-cache/acct-user/bitcoin-0-r1
index 5402b7906cc4..27e4450402f3 100644
--- a/metadata/md5-cache/acct-user/bitcoin-0-r1
+++ b/metadata/md5-cache/acct-user/bitcoin-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bitcoin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=68263c09894fc20f1f43b21826ae1fd3
diff --git a/metadata/md5-cache/acct-user/bitflu-0 b/metadata/md5-cache/acct-user/bitflu-0
index 7515cef02e11..0ad21e228be9 100644
--- a/metadata/md5-cache/acct-user/bitflu-0
+++ b/metadata/md5-cache/acct-user/bitflu-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bitflu
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ddb48332cd63899e18c3712a4de7e9f1
diff --git a/metadata/md5-cache/acct-user/bitlbee-0-r1 b/metadata/md5-cache/acct-user/bitlbee-0-r1
index 5936ca551e11..3990493aa743 100644
--- a/metadata/md5-cache/acct-user/bitlbee-0-r1
+++ b/metadata/md5-cache/acct-user/bitlbee-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/bitlbee
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ab583cdffafe97b6b4532ce4d45b4e5e
diff --git a/metadata/md5-cache/acct-user/blackbox_exporter-0 b/metadata/md5-cache/acct-user/blackbox_exporter-0
index 92397dc4c395..75d687dbe4b8 100644
--- a/metadata/md5-cache/acct-user/blackbox_exporter-0
+++ b/metadata/md5-cache/acct-user/blackbox_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/blackbox_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=533600d7e1d56eff2f69ef699c599a35
diff --git a/metadata/md5-cache/acct-user/boinc-0 b/metadata/md5-cache/acct-user/boinc-0
index 8b6047fca469..c6fc2e969a1a 100644
--- a/metadata/md5-cache/acct-user/boinc-0
+++ b/metadata/md5-cache/acct-user/boinc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/boinc acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a91d8dcf129e5c29d7f855d094e2c8c4
diff --git a/metadata/md5-cache/acct-user/brltty-0 b/metadata/md5-cache/acct-user/brltty-0
index 368e25561554..1327fc40931e 100644
--- a/metadata/md5-cache/acct-user/brltty-0
+++ b/metadata/md5-cache/acct-user/brltty-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/brltty acct-group/audio acct-group/brlapi acct-group/dialout acct-group/input acct-group/pulse-access acct-group/root acct-group/tty
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f0beb34a04f802039e7e0fee88e0aabd
diff --git a/metadata/md5-cache/acct-user/buildbot-0-r1 b/metadata/md5-cache/acct-user/buildbot-0-r1
index 5fdeaf7ba164..05a67d9a41bd 100644
--- a/metadata/md5-cache/acct-user/buildbot-0-r1
+++ b/metadata/md5-cache/acct-user/buildbot-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/buildbot
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9ab71e65305556059a7e9bf897eac00d
diff --git a/metadata/md5-cache/acct-user/burp-0-r1 b/metadata/md5-cache/acct-user/burp-0-r1
index ec7add7c1f19..8895631e4ecc 100644
--- a/metadata/md5-cache/acct-user/burp-0-r1
+++ b/metadata/md5-cache/acct-user/burp-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/burp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6217de606db593a33ffc45564ce876fa
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0-r1 b/metadata/md5-cache/acct-user/burrow_exporter-0-r1
index 5895f310ea03..709a3fc1732b 100644
--- a/metadata/md5-cache/acct-user/burrow_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/burrow_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/burrow_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=529dc3349fc7c90148559c4449dd6f58
diff --git a/metadata/md5-cache/acct-user/cadvisor-0-r1 b/metadata/md5-cache/acct-user/cadvisor-0-r1
index bbe4be2b797b..ccf83b2e65dd 100644
--- a/metadata/md5-cache/acct-user/cadvisor-0-r1
+++ b/metadata/md5-cache/acct-user/cadvisor-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cadvisor
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eaf2103fb7ae3ca7aca5d55781cd3f7f
diff --git a/metadata/md5-cache/acct-user/cancd-0-r1 b/metadata/md5-cache/acct-user/cancd-0-r1
index a5c7d7a2c48a..901f5b950bec 100644
--- a/metadata/md5-cache/acct-user/cancd-0-r1
+++ b/metadata/md5-cache/acct-user/cancd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cancd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1443d8bd42607b6fad614b7e0fa0b6c5
diff --git a/metadata/md5-cache/acct-user/carbon-0-r1 b/metadata/md5-cache/acct-user/carbon-0-r1
index 92808b2859ad..f87979810408 100644
--- a/metadata/md5-cache/acct-user/carbon-0-r1
+++ b/metadata/md5-cache/acct-user/carbon-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/carbon
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=347401450caecefafe0453440c6c5034
diff --git a/metadata/md5-cache/acct-user/ceph-0-r1 b/metadata/md5-cache/acct-user/ceph-0-r1
index 25c024838eb5..dda3b124d216 100644
--- a/metadata/md5-cache/acct-user/ceph-0-r1
+++ b/metadata/md5-cache/acct-user/ceph-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ceph
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=61d417b2593687d1efb7e32346aa5917
diff --git a/metadata/md5-cache/acct-user/cgit-0 b/metadata/md5-cache/acct-user/cgit-0
index b5c71fb6974a..030aa83541cb 100644
--- a/metadata/md5-cache/acct-user/cgit-0
+++ b/metadata/md5-cache/acct-user/cgit-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cgit
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1330e2bad987b1cddf3e675a0897a01c
diff --git a/metadata/md5-cache/acct-user/chronograf-0-r1 b/metadata/md5-cache/acct-user/chronograf-0-r1
index 35b8c935e5d9..eeea0e54a0ad 100644
--- a/metadata/md5-cache/acct-user/chronograf-0-r1
+++ b/metadata/md5-cache/acct-user/chronograf-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/chronograf
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5c385aa3a8f60186a5218c946189b004
diff --git a/metadata/md5-cache/acct-user/cinder-0-r1 b/metadata/md5-cache/acct-user/cinder-0-r1
index 2a61b39b892f..b20333236126 100644
--- a/metadata/md5-cache/acct-user/cinder-0-r1
+++ b/metadata/md5-cache/acct-user/cinder-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cinder
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d6043b82f68f3c23301104449ea4661c
diff --git a/metadata/md5-cache/acct-user/clair-0-r1 b/metadata/md5-cache/acct-user/clair-0-r1
index 68b49454d5a3..e6fac95f5999 100644
--- a/metadata/md5-cache/acct-user/clair-0-r1
+++ b/metadata/md5-cache/acct-user/clair-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/clair
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d338099321233bbe7fbae8af34def3f7
diff --git a/metadata/md5-cache/acct-user/clamav-0-r1 b/metadata/md5-cache/acct-user/clamav-0-r1
index 0ee0fd67a317..92afd087af55 100644
--- a/metadata/md5-cache/acct-user/clamav-0-r1
+++ b/metadata/md5-cache/acct-user/clamav-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/clamav
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7e3ed2c42096b55e9f6b00112ff16ea3
diff --git a/metadata/md5-cache/acct-user/cmd5checkpw-0-r1 b/metadata/md5-cache/acct-user/cmd5checkpw-0-r1
index f6f8e225913f..f4f20c902011 100644
--- a/metadata/md5-cache/acct-user/cmd5checkpw-0-r1
+++ b/metadata/md5-cache/acct-user/cmd5checkpw-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=02225d5f33cd543ce21808a68cc921cf
diff --git a/metadata/md5-cache/acct-user/cntlm-0 b/metadata/md5-cache/acct-user/cntlm-0
index f410e4a62fbe..f12eb935a880 100644
--- a/metadata/md5-cache/acct-user/cntlm-0
+++ b/metadata/md5-cache/acct-user/cntlm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cntlm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c25d365cdaac7410b25078726cddf89
diff --git a/metadata/md5-cache/acct-user/cockroach-0 b/metadata/md5-cache/acct-user/cockroach-0
index 8caaec5b3485..cb6cc4c4849a 100644
--- a/metadata/md5-cache/acct-user/cockroach-0
+++ b/metadata/md5-cache/acct-user/cockroach-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cockroach
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=66aad5eb86372334bebb73c64835f23d
diff --git a/metadata/md5-cache/acct-user/collectd-0 b/metadata/md5-cache/acct-user/collectd-0
index bc0f2fa29211..b532d5e89173 100644
--- a/metadata/md5-cache/acct-user/collectd-0
+++ b/metadata/md5-cache/acct-user/collectd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/collectd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=521d6d57277dcf453aa95271f14d7a50
diff --git a/metadata/md5-cache/acct-user/colord-0 b/metadata/md5-cache/acct-user/colord-0
index b1d0da0f7309..20e4afa5fe54 100644
--- a/metadata/md5-cache/acct-user/colord-0
+++ b/metadata/md5-cache/acct-user/colord-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/colord
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=21553e935997d4ffcc065c8ce3c8ee48
diff --git a/metadata/md5-cache/acct-user/consul-0-r1 b/metadata/md5-cache/acct-user/consul-0-r1
index 57da8365fba2..55a8158da454 100644
--- a/metadata/md5-cache/acct-user/consul-0-r1
+++ b/metadata/md5-cache/acct-user/consul-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/consul
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=918f97b4efc6a767b593af459c435fbf
diff --git a/metadata/md5-cache/acct-user/consul-template-0-r1 b/metadata/md5-cache/acct-user/consul-template-0-r1
index 1ef1d8d88860..506915525b95 100644
--- a/metadata/md5-cache/acct-user/consul-template-0-r1
+++ b/metadata/md5-cache/acct-user/consul-template-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/consul-template
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f9219ca574fe585e9271ac1d10dcd016
diff --git a/metadata/md5-cache/acct-user/consul_exporter-0 b/metadata/md5-cache/acct-user/consul_exporter-0
index 118c0a80cf2f..001a743e5830 100644
--- a/metadata/md5-cache/acct-user/consul_exporter-0
+++ b/metadata/md5-cache/acct-user/consul_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/consul_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2aa1052a032c5336074e58085a0671fb
diff --git a/metadata/md5-cache/acct-user/coredns-0 b/metadata/md5-cache/acct-user/coredns-0
index a14893135b65..1983646502b6 100644
--- a/metadata/md5-cache/acct-user/coredns-0
+++ b/metadata/md5-cache/acct-user/coredns-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/coredns
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1f915ff6afe1b8407ba80064e5864e70
diff --git a/metadata/md5-cache/acct-user/croc-0 b/metadata/md5-cache/acct-user/croc-0
index babceb734a4a..13a14ecb975b 100644
--- a/metadata/md5-cache/acct-user/croc-0
+++ b/metadata/md5-cache/acct-user/croc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/croc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d5ea8b37692621e966b9806869b1666b
diff --git a/metadata/md5-cache/acct-user/cron-0 b/metadata/md5-cache/acct-user/cron-0
index 5ea6f909fd9f..5f49f6aadcf6 100644
--- a/metadata/md5-cache/acct-user/cron-0
+++ b/metadata/md5-cache/acct-user/cron-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cron
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c2819ca285608b93f49f335b68e466db
diff --git a/metadata/md5-cache/acct-user/cvmfs-0-r1 b/metadata/md5-cache/acct-user/cvmfs-0-r1
index 249764bc2a3a..0e9d03ef0c5c 100644
--- a/metadata/md5-cache/acct-user/cvmfs-0-r1
+++ b/metadata/md5-cache/acct-user/cvmfs-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/cvmfs
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fe7a733faa9a9c32a75c5fc230bce8e7
diff --git a/metadata/md5-cache/acct-user/cyrus-0-r2 b/metadata/md5-cache/acct-user/cyrus-0-r2
index 781b42268ed9..47be2c453131 100644
--- a/metadata/md5-cache/acct-user/cyrus-0-r2
+++ b/metadata/md5-cache/acct-user/cyrus-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9efe9911343a837f41b59fdb988b88c2
diff --git a/metadata/md5-cache/acct-user/darkstat-0 b/metadata/md5-cache/acct-user/darkstat-0
index 55658c4c6327..6778b882cd7c 100644
--- a/metadata/md5-cache/acct-user/darkstat-0
+++ b/metadata/md5-cache/acct-user/darkstat-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e9376a3ad7c7035f059b2a8180d44fcd
diff --git a/metadata/md5-cache/acct-user/davfs2-0-r1 b/metadata/md5-cache/acct-user/davfs2-0-r1
index 7ebea0aba4fd..f072e976ae1d 100644
--- a/metadata/md5-cache/acct-user/davfs2-0-r1
+++ b/metadata/md5-cache/acct-user/davfs2-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/davfs2
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=87845b0c86cbda824a799fc0210bf97a
diff --git a/metadata/md5-cache/acct-user/dbmail-0 b/metadata/md5-cache/acct-user/dbmail-0
index 36cd9b50efe1..4253caa1e183 100644
--- a/metadata/md5-cache/acct-user/dbmail-0
+++ b/metadata/md5-cache/acct-user/dbmail-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dbmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=609b4d8134035f8a71dc39219834da53
diff --git a/metadata/md5-cache/acct-user/dbskkd-0 b/metadata/md5-cache/acct-user/dbskkd-0
index fc010ec6d256..ac74ceb32501 100644
--- a/metadata/md5-cache/acct-user/dbskkd-0
+++ b/metadata/md5-cache/acct-user/dbskkd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dbskkd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0d63b9757f7a8cfd70a9101d007cc477
diff --git a/metadata/md5-cache/acct-user/ddclient-0-r1 b/metadata/md5-cache/acct-user/ddclient-0-r1
index cc7b58f4870a..8a2a441bbf3f 100644
--- a/metadata/md5-cache/acct-user/ddclient-0-r1
+++ b/metadata/md5-cache/acct-user/ddclient-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ddclient
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b5ab181dfbc5a44ebcec760f072542d9
diff --git a/metadata/md5-cache/acct-user/defang-0 b/metadata/md5-cache/acct-user/defang-0
index e69bcc8508bc..1577a0a1f937 100644
--- a/metadata/md5-cache/acct-user/defang-0
+++ b/metadata/md5-cache/acct-user/defang-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/defang
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8608edd94d877284d1a80b284caf04a3
diff --git a/metadata/md5-cache/acct-user/dehydrated-0 b/metadata/md5-cache/acct-user/dehydrated-0
index eaf18318e29c..1a6121ffa81a 100644
--- a/metadata/md5-cache/acct-user/dehydrated-0
+++ b/metadata/md5-cache/acct-user/dehydrated-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dehydrated
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f2d6a6b35e6d1bc033fc8b513e610ff
diff --git a/metadata/md5-cache/acct-user/deluge-0-r1 b/metadata/md5-cache/acct-user/deluge-0-r1
index f3f5d9836b1b..58800615c38c 100644
--- a/metadata/md5-cache/acct-user/deluge-0-r1
+++ b/metadata/md5-cache/acct-user/deluge-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/deluge
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=87a3c93cc6e67faa093506380af3d1ff
diff --git a/metadata/md5-cache/acct-user/dhcp-0-r1 b/metadata/md5-cache/acct-user/dhcp-0-r1
index 267544dd4118..045a6f09b746 100644
--- a/metadata/md5-cache/acct-user/dhcp-0-r1
+++ b/metadata/md5-cache/acct-user/dhcp-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dhcp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=99676fd2e887a56cb54e592ffc4581ba
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0-r1 b/metadata/md5-cache/acct-user/dhcpcd-0-r1
index 57ca7059d453..48e26f0e7a6f 100644
--- a/metadata/md5-cache/acct-user/dhcpcd-0-r1
+++ b/metadata/md5-cache/acct-user/dhcpcd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dhcpcd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=be32f62b63deac788149a684573026b9
diff --git a/metadata/md5-cache/acct-user/dictd-0 b/metadata/md5-cache/acct-user/dictd-0
index 27c385790ad4..148c2e4c7e13 100644
--- a/metadata/md5-cache/acct-user/dictd-0
+++ b/metadata/md5-cache/acct-user/dictd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dictd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7db555a3252aed175ed77ac80fd9fdc8
diff --git a/metadata/md5-cache/acct-user/dirsrv-0 b/metadata/md5-cache/acct-user/dirsrv-0
index d2a28876916f..224176f69730 100644
--- a/metadata/md5-cache/acct-user/dirsrv-0
+++ b/metadata/md5-cache/acct-user/dirsrv-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dirsrv
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f97f40ede2dfde50f9f8f4c8ce020194
diff --git a/metadata/md5-cache/acct-user/distcc-1 b/metadata/md5-cache/acct-user/distcc-1
index 32293f6d3f63..f086f2148af0 100644
--- a/metadata/md5-cache/acct-user/distcc-1
+++ b/metadata/md5-cache/acct-user/distcc-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/distcc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3668c87a5e0bd1ad67d735179da7cb4b
diff --git a/metadata/md5-cache/acct-user/dnrd-0 b/metadata/md5-cache/acct-user/dnrd-0
index 0c1f46e53098..8fc71dbdf9c5 100644
--- a/metadata/md5-cache/acct-user/dnrd-0
+++ b/metadata/md5-cache/acct-user/dnrd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dnrd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9d8eefc1cc0f9f860f6651b79b31f6af
diff --git a/metadata/md5-cache/acct-user/dnscache-0 b/metadata/md5-cache/acct-user/dnscache-0
index 86412ae49236..aa7ba5e948e9 100644
--- a/metadata/md5-cache/acct-user/dnscache-0
+++ b/metadata/md5-cache/acct-user/dnscache-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3af24d2e954e8e83bdf93b8c789d49a4
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
index e65e767f751e..b3690ed486f2 100644
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dnscrypt-proxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=695f040ecbd6db8a9a6667f5943c7c67
diff --git a/metadata/md5-cache/acct-user/dnsdist-0-r1 b/metadata/md5-cache/acct-user/dnsdist-0-r1
index 34c18f39ef89..8b6d03d247ff 100644
--- a/metadata/md5-cache/acct-user/dnsdist-0-r1
+++ b/metadata/md5-cache/acct-user/dnsdist-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dnsdist
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=711c93f81b38b4122e3c95561db020e3
diff --git a/metadata/md5-cache/acct-user/dnslog-0 b/metadata/md5-cache/acct-user/dnslog-0
index b52314364b77..ae70396af22e 100644
--- a/metadata/md5-cache/acct-user/dnslog-0
+++ b/metadata/md5-cache/acct-user/dnslog-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9bc5793150e173959690db67824efea1
diff --git a/metadata/md5-cache/acct-user/dnsmasq-0-r1 b/metadata/md5-cache/acct-user/dnsmasq-0-r1
index d3c65ae425d6..720e9d8c5f2c 100644
--- a/metadata/md5-cache/acct-user/dnsmasq-0-r1
+++ b/metadata/md5-cache/acct-user/dnsmasq-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dnsmasq
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d8d30c8c2622399f55fa104d18829168
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
index ddcedde87ed2..019e9be39da6 100644
--- a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dnsmasq_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ec2a22e3cd34c8b1651e7de50c18dfbe
diff --git a/metadata/md5-cache/acct-user/docker_auth-0-r1 b/metadata/md5-cache/acct-user/docker_auth-0-r1
index 988ca2a95470..dca64a5e5c62 100644
--- a/metadata/md5-cache/acct-user/docker_auth-0-r1
+++ b/metadata/md5-cache/acct-user/docker_auth-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/docker_auth
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e27fa67d8a9f35c5ff5e7a5428ef89a7
diff --git a/metadata/md5-cache/acct-user/dovecot-0-r1 b/metadata/md5-cache/acct-user/dovecot-0-r1
index daf5244994d2..1d9627f27b19 100644
--- a/metadata/md5-cache/acct-user/dovecot-0-r1
+++ b/metadata/md5-cache/acct-user/dovecot-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dovecot
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f4321754731ab4156e1c5655159bfdf1
diff --git a/metadata/md5-cache/acct-user/dovenull-0-r1 b/metadata/md5-cache/acct-user/dovenull-0-r1
index 8c026d475837..67d0f663a9fa 100644
--- a/metadata/md5-cache/acct-user/dovenull-0-r1
+++ b/metadata/md5-cache/acct-user/dovenull-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dovenull
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ada054df4b0c1dcdf599404952e87702
diff --git a/metadata/md5-cache/acct-user/drone-0 b/metadata/md5-cache/acct-user/drone-0
index b7710eee6579..3893962e4a79 100644
--- a/metadata/md5-cache/acct-user/drone-0
+++ b/metadata/md5-cache/acct-user/drone-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/drone
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b101d8dc32e3ab4b73d49f91dd3280f5
diff --git a/metadata/md5-cache/acct-user/duende-0-r1 b/metadata/md5-cache/acct-user/duende-0-r1
index 5dfa6c12059a..bb9525e647d2 100644
--- a/metadata/md5-cache/acct-user/duende-0-r1
+++ b/metadata/md5-cache/acct-user/duende-0-r1
@@ -6,5 +6,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/maradns acct-group/maradns
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5395e0bef2c329ca8fcdaf4d76b7ebf0
diff --git a/metadata/md5-cache/acct-user/ejabberd-0 b/metadata/md5-cache/acct-user/ejabberd-0
index 5b96acfdd7ae..d36b034a3e8b 100644
--- a/metadata/md5-cache/acct-user/ejabberd-0
+++ b/metadata/md5-cache/acct-user/ejabberd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ejabberd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ba3926a8419e59beb530839adad8bf8a
diff --git a/metadata/md5-cache/acct-user/ejabberd-1 b/metadata/md5-cache/acct-user/ejabberd-1
index 596db9721808..0a8a7228e8dc 100644
--- a/metadata/md5-cache/acct-user/ejabberd-1
+++ b/metadata/md5-cache/acct-user/ejabberd-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ejabberd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=94cd8ac77b21a21a81d16c6558a15d02
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0-r1 b/metadata/md5-cache/acct-user/elasticsearch-0-r1
index fb8e5a6b4468..df4ba987256d 100644
--- a/metadata/md5-cache/acct-user/elasticsearch-0-r1
+++ b/metadata/md5-cache/acct-user/elasticsearch-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/elasticsearch
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=db19c19b6e7a9b98a1b29f509821cde4
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
index a26706463673..6588cf5d675c 100644
--- a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/elasticsearch_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f0f4091be7f82aeba583ddd08dce2611
diff --git a/metadata/md5-cache/acct-user/energi3-0 b/metadata/md5-cache/acct-user/energi3-0
index e49ee0744a29..7a422705a077 100644
--- a/metadata/md5-cache/acct-user/energi3-0
+++ b/metadata/md5-cache/acct-user/energi3-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/energi3
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c7287bb08088dab497aef50b007b8174
diff --git a/metadata/md5-cache/acct-user/epmd-0-r1 b/metadata/md5-cache/acct-user/epmd-0-r1
index da6eb743fe49..5ae9f21b525d 100644
--- a/metadata/md5-cache/acct-user/epmd-0-r1
+++ b/metadata/md5-cache/acct-user/epmd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/epmd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ed03e977c47334b73d5146b0d9f4df9e
diff --git a/metadata/md5-cache/acct-user/err-0 b/metadata/md5-cache/acct-user/err-0
index c71af25cd2c0..3e5bd75a86a0 100644
--- a/metadata/md5-cache/acct-user/err-0
+++ b/metadata/md5-cache/acct-user/err-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/err
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=49a3c83c80b86313f816f70efae98f38
diff --git a/metadata/md5-cache/acct-user/etcd-0-r1 b/metadata/md5-cache/acct-user/etcd-0-r1
index 70c932ac6862..5fac917c04af 100644
--- a/metadata/md5-cache/acct-user/etcd-0-r1
+++ b/metadata/md5-cache/acct-user/etcd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/etcd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b6ee5d4863af3c0fd94925b4bd0f949d
diff --git a/metadata/md5-cache/acct-user/exabgp-0-r1 b/metadata/md5-cache/acct-user/exabgp-0-r1
index 2c94f2398d35..5246bd991cad 100644
--- a/metadata/md5-cache/acct-user/exabgp-0-r1
+++ b/metadata/md5-cache/acct-user/exabgp-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/exabgp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=af5479646683f110706d956f2a1e77a6
diff --git a/metadata/md5-cache/acct-user/ez-ipupd-0 b/metadata/md5-cache/acct-user/ez-ipupd-0
index 143c9ffca91d..b25b91e51cc2 100644
--- a/metadata/md5-cache/acct-user/ez-ipupd-0
+++ b/metadata/md5-cache/acct-user/ez-ipupd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ez-ipupd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=107ee2a4fa52c54449ef0bc27ca85a9b
diff --git a/metadata/md5-cache/acct-user/fax-0 b/metadata/md5-cache/acct-user/fax-0
index 190bba4b6e43..82b3e2d1f0c6 100644
--- a/metadata/md5-cache/acct-user/fax-0
+++ b/metadata/md5-cache/acct-user/fax-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fax
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3813ca1d3a4fb18f9db260f7c6b26d68
diff --git a/metadata/md5-cache/acct-user/fcron-0 b/metadata/md5-cache/acct-user/fcron-0
index e2a584dcbb4b..19264b3dd8ab 100644
--- a/metadata/md5-cache/acct-user/fcron-0
+++ b/metadata/md5-cache/acct-user/fcron-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fcron
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=60303e01aeee92417f612299f765953d
diff --git a/metadata/md5-cache/acct-user/fdm-0 b/metadata/md5-cache/acct-user/fdm-0
index 09d3a437b60b..9ebe6d9c106d 100644
--- a/metadata/md5-cache/acct-user/fdm-0
+++ b/metadata/md5-cache/acct-user/fdm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fdm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9b3a59673f458783b10fba43a2d7e7f1
diff --git a/metadata/md5-cache/acct-user/fetchmail-0-r1 b/metadata/md5-cache/acct-user/fetchmail-0-r1
index 2e5a2ecec657..de89f610c272 100644
--- a/metadata/md5-cache/acct-user/fetchmail-0-r1
+++ b/metadata/md5-cache/acct-user/fetchmail-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fetchmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d3d21fa443b96154c83f83c4aa174fcf
diff --git a/metadata/md5-cache/acct-user/fhem-0-r1 b/metadata/md5-cache/acct-user/fhem-0-r1
index 874dd1dfe1cb..b8207a2b8996 100644
--- a/metadata/md5-cache/acct-user/fhem-0-r1
+++ b/metadata/md5-cache/acct-user/fhem-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fhem
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=58998b96956b5a68e853cf16a6b5d8f5
diff --git a/metadata/md5-cache/acct-user/firebird-0-r1 b/metadata/md5-cache/acct-user/firebird-0-r1
index 2b8e5494888c..d91027b97d56 100644
--- a/metadata/md5-cache/acct-user/firebird-0-r1
+++ b/metadata/md5-cache/acct-user/firebird-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/firebird
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=564bddc8d0fee8edc00fbf050158c934
diff --git a/metadata/md5-cache/acct-user/flatpak-0 b/metadata/md5-cache/acct-user/flatpak-0
index ad85caf0074e..5e4cf7482788 100644
--- a/metadata/md5-cache/acct-user/flatpak-0
+++ b/metadata/md5-cache/acct-user/flatpak-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/flatpak
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7fe430f6d2af3c892e6666effcb722c8
diff --git a/metadata/md5-cache/acct-user/flows-0 b/metadata/md5-cache/acct-user/flows-0
index a2cbee1b79e0..6e721a4bdd91 100644
--- a/metadata/md5-cache/acct-user/flows-0
+++ b/metadata/md5-cache/acct-user/flows-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/flows
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=44d0fea430d3ee921a56666cd214c92d
diff --git a/metadata/md5-cache/acct-user/fluentd-0-r1 b/metadata/md5-cache/acct-user/fluentd-0-r1
index 1ea49f0eb662..7a733f9d4517 100644
--- a/metadata/md5-cache/acct-user/fluentd-0-r1
+++ b/metadata/md5-cache/acct-user/fluentd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fluentd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=da23e9cbd7b28600db1ad6c12002c526
diff --git a/metadata/md5-cache/acct-user/fnord-0 b/metadata/md5-cache/acct-user/fnord-0
index 0860fb4e5346..49ffe0364241 100644
--- a/metadata/md5-cache/acct-user/fnord-0
+++ b/metadata/md5-cache/acct-user/fnord-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cc50abc168ec31427393a8e3a7f4e775
diff --git a/metadata/md5-cache/acct-user/fnordlog-0 b/metadata/md5-cache/acct-user/fnordlog-0
index 8be26b71a451..fedefa98c689 100644
--- a/metadata/md5-cache/acct-user/fnordlog-0
+++ b/metadata/md5-cache/acct-user/fnordlog-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7deae5559b07e9b7f37da175479e3f5c
diff --git a/metadata/md5-cache/acct-user/foldingathome-0 b/metadata/md5-cache/acct-user/foldingathome-0
index 1a14624928a9..36b92dc5d0b2 100644
--- a/metadata/md5-cache/acct-user/foldingathome-0
+++ b/metadata/md5-cache/acct-user/foldingathome-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/foldingathome acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=15354c7a83738a10ac4cf490281d3c3c
diff --git a/metadata/md5-cache/acct-user/fp-multiuser-0 b/metadata/md5-cache/acct-user/fp-multiuser-0
index 6cf0b5cd7c00..3f31401f52e0 100644
--- a/metadata/md5-cache/acct-user/fp-multiuser-0
+++ b/metadata/md5-cache/acct-user/fp-multiuser-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fp-multiuser
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=658d55896a79f22acebb00791f5dbe40
diff --git a/metadata/md5-cache/acct-user/freenet-0 b/metadata/md5-cache/acct-user/freenet-0
index afd5392dbef3..930e1c5cdc04 100644
--- a/metadata/md5-cache/acct-user/freenet-0
+++ b/metadata/md5-cache/acct-user/freenet-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/freenet
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0d30fb11c1a9e68b5c6fb28d6d4f86da
diff --git a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0 b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
index 50b3117790af..09a55dd729d9 100644
--- a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
+++ b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/fritzbox_smarthome_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=daeccf71021c5e55a123fb4df7d568d9
diff --git a/metadata/md5-cache/acct-user/frr-0 b/metadata/md5-cache/acct-user/frr-0
index 8d0c0bc32fac..062d858cc816 100644
--- a/metadata/md5-cache/acct-user/frr-0
+++ b/metadata/md5-cache/acct-user/frr-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/frr
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=61ef64be33c5e2f86ede9e59b7183d29
diff --git a/metadata/md5-cache/acct-user/ftp-0-r3 b/metadata/md5-cache/acct-user/ftp-0-r3
index 09de577fd1ef..a40381fae8a5 100644
--- a/metadata/md5-cache/acct-user/ftp-0-r3
+++ b/metadata/md5-cache/acct-user/ftp-0-r3
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ftp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=49b4ddc17a9d9af8f33d94993b0e5677
diff --git a/metadata/md5-cache/acct-user/ftpproxy-0 b/metadata/md5-cache/acct-user/ftpproxy-0
index dfa3c0ab7c8e..11a83290dbe5 100644
--- a/metadata/md5-cache/acct-user/ftpproxy-0
+++ b/metadata/md5-cache/acct-user/ftpproxy-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ftpproxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b143967a367115b2e1351920bf2e4aff
diff --git a/metadata/md5-cache/acct-user/gatling-0-r1 b/metadata/md5-cache/acct-user/gatling-0-r1
index e271e3df0e36..21ad193469a9 100644
--- a/metadata/md5-cache/acct-user/gatling-0-r1
+++ b/metadata/md5-cache/acct-user/gatling-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gatling
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7dc2482ce98b65df3f73ac7cf1d2f107
diff --git a/metadata/md5-cache/acct-user/gauth-0 b/metadata/md5-cache/acct-user/gauth-0
index 6ce28286d238..c3ce17ddfdb8 100644
--- a/metadata/md5-cache/acct-user/gauth-0
+++ b/metadata/md5-cache/acct-user/gauth-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gauth
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ace589234d55c74382bfbe3ddedc998d
diff --git a/metadata/md5-cache/acct-user/gdm-0 b/metadata/md5-cache/acct-user/gdm-0
index 9b062c31337d..cd644feb397e 100644
--- a/metadata/md5-cache/acct-user/gdm-0
+++ b/metadata/md5-cache/acct-user/gdm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gdm acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=190793717f4743ec7191bf2f3999b5e5
diff --git a/metadata/md5-cache/acct-user/geneweb-0-r1 b/metadata/md5-cache/acct-user/geneweb-0-r1
index 4f6d32521ba1..0f4a32f8606e 100644
--- a/metadata/md5-cache/acct-user/geneweb-0-r1
+++ b/metadata/md5-cache/acct-user/geneweb-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/geneweb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6b9116072ec09349c40e75b56cdcdf85
diff --git a/metadata/md5-cache/acct-user/geoclue-0 b/metadata/md5-cache/acct-user/geoclue-0
index 0ffabbc4e8eb..887650a33c71 100644
--- a/metadata/md5-cache/acct-user/geoclue-0
+++ b/metadata/md5-cache/acct-user/geoclue-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/geoclue
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4412cf4c1b057e1e1bc1baf8450d4820
diff --git a/metadata/md5-cache/acct-user/gerbera-0-r1 b/metadata/md5-cache/acct-user/gerbera-0-r1
index e5f3535fa77e..d63a25d3c923 100644
--- a/metadata/md5-cache/acct-user/gerbera-0-r1
+++ b/metadata/md5-cache/acct-user/gerbera-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gerbera acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f69a3f13d8a9d7013b2eac1e6e140c8
diff --git a/metadata/md5-cache/acct-user/git-0-r2 b/metadata/md5-cache/acct-user/git-0-r2
index a4c4444e663b..8827baf10adb 100644
--- a/metadata/md5-cache/acct-user/git-0-r2
+++ b/metadata/md5-cache/acct-user/git-0-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390
 RDEPEND=acct-group/git
 REQUIRED_USE=^^ ( git gitea gitolite )
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e331672c09225cf89187d3b157fa543
diff --git a/metadata/md5-cache/acct-user/github-exporter-0 b/metadata/md5-cache/acct-user/github-exporter-0
index 5f80d2a26df6..c3693b831c0f 100644
--- a/metadata/md5-cache/acct-user/github-exporter-0
+++ b/metadata/md5-cache/acct-user/github-exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/github-exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4c1517ee1a64c602a6e511bdd4a9fa4e
diff --git a/metadata/md5-cache/acct-user/gitlab-runner-1 b/metadata/md5-cache/acct-user/gitlab-runner-1
index f23e434a6756..86a74742f4f8 100644
--- a/metadata/md5-cache/acct-user/gitlab-runner-1
+++ b/metadata/md5-cache/acct-user/gitlab-runner-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gitlab-runner
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e9f5b8931e42daa3b0db0c5c5fff53a
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0-r1 b/metadata/md5-cache/acct-user/gkrellmd-0-r1
index bc50c411108d..d0ae04fee1d8 100644
--- a/metadata/md5-cache/acct-user/gkrellmd-0-r1
+++ b/metadata/md5-cache/acct-user/gkrellmd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gkrellmd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0c379134a244494bf3467ffe08505868
diff --git a/metadata/md5-cache/acct-user/glance-0-r1 b/metadata/md5-cache/acct-user/glance-0-r1
index a865eaf47cd2..5e0d15951dac 100644
--- a/metadata/md5-cache/acct-user/glance-0-r1
+++ b/metadata/md5-cache/acct-user/glance-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/glance
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9416bc7d36dc727632cb6aa9603ac385
diff --git a/metadata/md5-cache/acct-user/gluster-0-r1 b/metadata/md5-cache/acct-user/gluster-0-r1
index 324acfdb093c..4829dc943da6 100644
--- a/metadata/md5-cache/acct-user/gluster-0-r1
+++ b/metadata/md5-cache/acct-user/gluster-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gluster
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ed95e7393dc719c414a03fdf122946c7
diff --git a/metadata/md5-cache/acct-user/gnump3d-0 b/metadata/md5-cache/acct-user/gnump3d-0
index 541c36e556a7..35e51cc749e6 100644
--- a/metadata/md5-cache/acct-user/gnump3d-0
+++ b/metadata/md5-cache/acct-user/gnump3d-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gnump3d
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3f7258d07681bf67e372d62b5b81df4e
diff --git a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0 b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
index 04c8baf73501..037ce57d9ceb 100644
--- a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
+++ b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gnupg-pkcs11-scd-proxy acct-group/gnupg-pkcs11
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f473ac37e48a2a516205825a81350031
diff --git a/metadata/md5-cache/acct-user/gopher-0 b/metadata/md5-cache/acct-user/gopher-0
index 5e42168fda23..a60dffa7e792 100644
--- a/metadata/md5-cache/acct-user/gopher-0
+++ b/metadata/md5-cache/acct-user/gopher-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gopher
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=afc5c4dff1bdadd057bc0cb3231d9526
diff --git a/metadata/md5-cache/acct-user/gopherd-0 b/metadata/md5-cache/acct-user/gopherd-0
index fd09603bd460..0c96ac863595 100644
--- a/metadata/md5-cache/acct-user/gopherd-0
+++ b/metadata/md5-cache/acct-user/gopherd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gopherd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5e858a349a9de4d5c926f028264698a4
diff --git a/metadata/md5-cache/acct-user/gpsd-0-r2 b/metadata/md5-cache/acct-user/gpsd-0-r2
index 1d3b4769d955..efe28434830c 100644
--- a/metadata/md5-cache/acct-user/gpsd-0-r2
+++ b/metadata/md5-cache/acct-user/gpsd-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/dialout acct-group/uucp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f5e091b329f4d12dff93c77d630aca0e
diff --git a/metadata/md5-cache/acct-user/grafana-0-r1 b/metadata/md5-cache/acct-user/grafana-0-r1
index 9f363027c8b8..9da284b62741 100644
--- a/metadata/md5-cache/acct-user/grafana-0-r1
+++ b/metadata/md5-cache/acct-user/grafana-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/grafana
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8c20a07a72bc54b680266ca29c1dc64c
diff --git a/metadata/md5-cache/acct-user/graylog-0-r1 b/metadata/md5-cache/acct-user/graylog-0-r1
index 7c79c1cee4ec..dfd06451b821 100644
--- a/metadata/md5-cache/acct-user/graylog-0-r1
+++ b/metadata/md5-cache/acct-user/graylog-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/graylog
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e56d7a6597f74b650e0803adb29702ce
diff --git a/metadata/md5-cache/acct-user/greetd-0-r1 b/metadata/md5-cache/acct-user/greetd-0-r1
index 0fa343f95a7e..cd6c139b53d5 100644
--- a/metadata/md5-cache/acct-user/greetd-0-r1
+++ b/metadata/md5-cache/acct-user/greetd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/greetd acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4212aaa4e6eedb6a31c980877c3f8911
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0 b/metadata/md5-cache/acct-user/grok_exporter-0
index b820551af843..411fe67db460 100644
--- a/metadata/md5-cache/acct-user/grok_exporter-0
+++ b/metadata/md5-cache/acct-user/grok_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/grok_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ba5327500a75647a6757e628d2a2843f
diff --git a/metadata/md5-cache/acct-user/groonga-0 b/metadata/md5-cache/acct-user/groonga-0
index 571eb2895330..a19a7c7f8ab6 100644
--- a/metadata/md5-cache/acct-user/groonga-0
+++ b/metadata/md5-cache/acct-user/groonga-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/groonga
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=419550c6812dcb3380f7ea7f0e17de63
diff --git a/metadata/md5-cache/acct-user/gvm-0-r1 b/metadata/md5-cache/acct-user/gvm-0-r1
index f037f0e4479e..4ae8360d796c 100644
--- a/metadata/md5-cache/acct-user/gvm-0-r1
+++ b/metadata/md5-cache/acct-user/gvm-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/gvm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b695af84c5cdfd96a3edaa6925ac4fca
diff --git a/metadata/md5-cache/acct-user/h2o-0 b/metadata/md5-cache/acct-user/h2o-0
index f1baab360a7b..cb4821647ba7 100644
--- a/metadata/md5-cache/acct-user/h2o-0
+++ b/metadata/md5-cache/acct-user/h2o-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/h2o
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=84d34875c5c2b0d96294b7c7a6e76243
diff --git a/metadata/md5-cache/acct-user/hacluster-0 b/metadata/md5-cache/acct-user/hacluster-0
index b0205677fa38..40671a5eb12a 100644
--- a/metadata/md5-cache/acct-user/hacluster-0
+++ b/metadata/md5-cache/acct-user/hacluster-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/haclient
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a4785e58af07bbb098c8dfceab3e8550
diff --git a/metadata/md5-cache/acct-user/haproxy-0-r1 b/metadata/md5-cache/acct-user/haproxy-0-r1
index cf73a88a2847..2cffe62b3b99 100644
--- a/metadata/md5-cache/acct-user/haproxy-0-r1
+++ b/metadata/md5-cache/acct-user/haproxy-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/haproxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ba210488f5ffed41222d32cbf0dffa91
diff --git a/metadata/md5-cache/acct-user/havp-0 b/metadata/md5-cache/acct-user/havp-0
index adda47954c5e..3394fe1d163c 100644
--- a/metadata/md5-cache/acct-user/havp-0
+++ b/metadata/md5-cache/acct-user/havp-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/havp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c5125ffeef94ce15324ec65774f49793
diff --git a/metadata/md5-cache/acct-user/headscale-0 b/metadata/md5-cache/acct-user/headscale-0
index 55e351d8073c..722d76dbbdbf 100644
--- a/metadata/md5-cache/acct-user/headscale-0
+++ b/metadata/md5-cache/acct-user/headscale-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/headscale
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b98c0a9379bffc61a0a07ae69c2bdba3
diff --git a/metadata/md5-cache/acct-user/heat-0-r1 b/metadata/md5-cache/acct-user/heat-0-r1
index f88eae1f736f..515dbf748d33 100644
--- a/metadata/md5-cache/acct-user/heat-0-r1
+++ b/metadata/md5-cache/acct-user/heat-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/heat
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=11c65953154c88544415d29a37a27e01
diff --git a/metadata/md5-cache/acct-user/hsqldb-0 b/metadata/md5-cache/acct-user/hsqldb-0
index 6d5c8b3df31b..4bf410f6b985 100644
--- a/metadata/md5-cache/acct-user/hsqldb-0
+++ b/metadata/md5-cache/acct-user/hsqldb-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/hsqldb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=483a6301f6684dc271e14de86f33d47d
diff --git a/metadata/md5-cache/acct-user/http-0 b/metadata/md5-cache/acct-user/http-0
index ea54d00446aa..8169e367986e 100644
--- a/metadata/md5-cache/acct-user/http-0
+++ b/metadata/md5-cache/acct-user/http-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/http
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=446904e0b6d97a6d049ac9ffd4f886a5
diff --git a/metadata/md5-cache/acct-user/i2p-0-r1 b/metadata/md5-cache/acct-user/i2p-0-r1
index c0d0f87d439b..0cc3297609d6 100644
--- a/metadata/md5-cache/acct-user/i2p-0-r1
+++ b/metadata/md5-cache/acct-user/i2p-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/i2p
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b1e2c67be65cdf4e20898210cb5e74b5
diff --git a/metadata/md5-cache/acct-user/i2pd-0-r1 b/metadata/md5-cache/acct-user/i2pd-0-r1
index 66b950b68522..88ad7abe8395 100644
--- a/metadata/md5-cache/acct-user/i2pd-0-r1
+++ b/metadata/md5-cache/acct-user/i2pd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/i2pd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=be35aeeea194ba2a4e0ce86d361ae634
diff --git a/metadata/md5-cache/acct-user/icecast-0 b/metadata/md5-cache/acct-user/icecast-0
index 661f6a37947c..3b07d5b45b03 100644
--- a/metadata/md5-cache/acct-user/icecast-0
+++ b/metadata/md5-cache/acct-user/icecast-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/icecast
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=738823659241bc06f5909906818561cd
diff --git a/metadata/md5-cache/acct-user/icecream-0 b/metadata/md5-cache/acct-user/icecream-0
index 010f2f943235..10332f0c8ee5 100644
--- a/metadata/md5-cache/acct-user/icecream-0
+++ b/metadata/md5-cache/acct-user/icecream-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/icecream
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3db4fae16a7e1bff79225ffc82a794ed
diff --git a/metadata/md5-cache/acct-user/ices-0 b/metadata/md5-cache/acct-user/ices-0
index 071c9468b6d3..6082c52126df 100644
--- a/metadata/md5-cache/acct-user/ices-0
+++ b/metadata/md5-cache/acct-user/ices-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ices
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7265d152afcbb3a3205dba24db3050f1
diff --git a/metadata/md5-cache/acct-user/icinga-0-r1 b/metadata/md5-cache/acct-user/icinga-0-r1
index 47d3ac592cef..1c8952cb529f 100644
--- a/metadata/md5-cache/acct-user/icinga-0-r1
+++ b/metadata/md5-cache/acct-user/icinga-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/icinga acct-group/icingacmd acct-group/nagios
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=08adb2cc23fb2a9727865d8a7d5461f4
diff --git a/metadata/md5-cache/acct-user/icingadirector-0 b/metadata/md5-cache/acct-user/icingadirector-0
index ae039132a7fb..94d043ffacac 100644
--- a/metadata/md5-cache/acct-user/icingadirector-0
+++ b/metadata/md5-cache/acct-user/icingadirector-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/icingaweb2
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b162a15c228756de640930729e24b25b
diff --git a/metadata/md5-cache/acct-user/influxdb-0-r1 b/metadata/md5-cache/acct-user/influxdb-0-r1
index 8b17073a6b51..c2613d18ccc0 100644
--- a/metadata/md5-cache/acct-user/influxdb-0-r1
+++ b/metadata/md5-cache/acct-user/influxdb-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/influxdb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=37b4c81f4ba4ff36ef3de7858b1cb350
diff --git a/metadata/md5-cache/acct-user/inspircd-0-r1 b/metadata/md5-cache/acct-user/inspircd-0-r1
index bc8f34a904b3..3fe8abf579e3 100644
--- a/metadata/md5-cache/acct-user/inspircd-0-r1
+++ b/metadata/md5-cache/acct-user/inspircd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/inspircd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=269fc7c628c019545caa22ee01f4ba6d
diff --git a/metadata/md5-cache/acct-user/ipfs-0-r1 b/metadata/md5-cache/acct-user/ipfs-0-r1
index 97ec96243dc3..f27e6a87e046 100644
--- a/metadata/md5-cache/acct-user/ipfs-0-r1
+++ b/metadata/md5-cache/acct-user/ipfs-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ipfs
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5a26194c7398e7c67af6b0f5c7a83a33
diff --git a/metadata/md5-cache/acct-user/ippl-0-r1 b/metadata/md5-cache/acct-user/ippl-0-r1
index a59604a22130..35ce12ad7546 100644
--- a/metadata/md5-cache/acct-user/ippl-0-r1
+++ b/metadata/md5-cache/acct-user/ippl-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2b03815f1289c6d60dc12e9ea2d438cc
diff --git a/metadata/md5-cache/acct-user/ipsec-0 b/metadata/md5-cache/acct-user/ipsec-0
index a20bc0ae28f6..ea3481fc8738 100644
--- a/metadata/md5-cache/acct-user/ipsec-0
+++ b/metadata/md5-cache/acct-user/ipsec-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ipsec
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=39c9f12b9f6a5143c4306b8b5895ca09
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0 b/metadata/md5-cache/acct-user/ipsentinel-0
index 22f0e1c100c3..42fba7359a1b 100644
--- a/metadata/md5-cache/acct-user/ipsentinel-0
+++ b/metadata/md5-cache/acct-user/ipsentinel-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ipsentinel
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b135aa760c7b6ad44422667ffd81083f
diff --git a/metadata/md5-cache/acct-user/iroffer-0 b/metadata/md5-cache/acct-user/iroffer-0
index f4a6a4c913dc..a5537d7afe80 100644
--- a/metadata/md5-cache/acct-user/iroffer-0
+++ b/metadata/md5-cache/acct-user/iroffer-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/iroffer
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=95c02a58f8b33970cd3d1cda6d5162a6
diff --git a/metadata/md5-cache/acct-user/jabber-0 b/metadata/md5-cache/acct-user/jabber-0
index dc408d945866..99740fc716af 100644
--- a/metadata/md5-cache/acct-user/jabber-0
+++ b/metadata/md5-cache/acct-user/jabber-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/jabber
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=76228d4ad3a779ef15dcad9356e3e965
diff --git a/metadata/md5-cache/acct-user/jenkins-0 b/metadata/md5-cache/acct-user/jenkins-0
index e7918bd540dd..9941a444ebdc 100644
--- a/metadata/md5-cache/acct-user/jenkins-0
+++ b/metadata/md5-cache/acct-user/jenkins-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/jenkins
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6476de20d170d83a85d0b3418fbb7ac5
diff --git a/metadata/md5-cache/acct-user/kafka-0-r1 b/metadata/md5-cache/acct-user/kafka-0-r1
index 411c0396d212..4e6b68492bed 100644
--- a/metadata/md5-cache/acct-user/kafka-0-r1
+++ b/metadata/md5-cache/acct-user/kafka-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kafka
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8302b25f09f91ff16ab244aaa735181b
diff --git a/metadata/md5-cache/acct-user/kapacitor-0-r1 b/metadata/md5-cache/acct-user/kapacitor-0-r1
index 5859561e7c10..15ce5f598210 100644
--- a/metadata/md5-cache/acct-user/kapacitor-0-r1
+++ b/metadata/md5-cache/acct-user/kapacitor-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kapacitor
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f0aa7116fa65c870ed03717150239466
diff --git a/metadata/md5-cache/acct-user/karma-0 b/metadata/md5-cache/acct-user/karma-0
index 7f4ff6be641f..df36a2188327 100644
--- a/metadata/md5-cache/acct-user/karma-0
+++ b/metadata/md5-cache/acct-user/karma-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/karma
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=73629794b8664d114c6abd4804aebb7b
diff --git a/metadata/md5-cache/acct-user/keystone-0-r1 b/metadata/md5-cache/acct-user/keystone-0-r1
index 2ed3812db7ba..6bfff08b23bc 100644
--- a/metadata/md5-cache/acct-user/keystone-0-r1
+++ b/metadata/md5-cache/acct-user/keystone-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/keystone
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3a6966e2aab7f774aec7fe695f11b9ef
diff --git a/metadata/md5-cache/acct-user/kibana-0-r1 b/metadata/md5-cache/acct-user/kibana-0-r1
index 974d6c925c7c..4281624c00c7 100644
--- a/metadata/md5-cache/acct-user/kibana-0-r1
+++ b/metadata/md5-cache/acct-user/kibana-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kibana
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5661d8551c1db87e196691b7fd5f2d0f
diff --git a/metadata/md5-cache/acct-user/kismet-0-r1 b/metadata/md5-cache/acct-user/kismet-0-r1
index e25d7c18503d..756b76dbf553 100644
--- a/metadata/md5-cache/acct-user/kismet-0-r1
+++ b/metadata/md5-cache/acct-user/kismet-0-r1
@@ -6,5 +6,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kismet acct-group/kismet
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=481e3c617f9b5cbc5aa71e5d474ea119
diff --git a/metadata/md5-cache/acct-user/knot-0-r1 b/metadata/md5-cache/acct-user/knot-0-r1
index 98ad3d7e5577..b92beda5d9fa 100644
--- a/metadata/md5-cache/acct-user/knot-0-r1
+++ b/metadata/md5-cache/acct-user/knot-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/knot
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=112d1e2c08b711ce1adb06c28a0cede2
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0-r1 b/metadata/md5-cache/acct-user/kube-apiserver-0-r1
index 67c423274863..93851b0969ab 100644
--- a/metadata/md5-cache/acct-user/kube-apiserver-0-r1
+++ b/metadata/md5-cache/acct-user/kube-apiserver-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kube-apiserver
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7810afddb6357eee9b4a96229040a645
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0-r1 b/metadata/md5-cache/acct-user/kube-controller-manager-0-r1
index e445bb23da61..05f666e45b4d 100644
--- a/metadata/md5-cache/acct-user/kube-controller-manager-0-r1
+++ b/metadata/md5-cache/acct-user/kube-controller-manager-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kube-controller-manager
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ea7783b40f308e0d78e89207fa9b409e
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0-r1 b/metadata/md5-cache/acct-user/kube-scheduler-0-r1
index 97f086c3b634..be8a1e3fbd57 100644
--- a/metadata/md5-cache/acct-user/kube-scheduler-0-r1
+++ b/metadata/md5-cache/acct-user/kube-scheduler-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/kube-scheduler
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f21856a412a70e3e5b3185faaccb3a9c
diff --git a/metadata/md5-cache/acct-user/ldap-0 b/metadata/md5-cache/acct-user/ldap-0
index c3e0672ccc1d..c14143d6eb41 100644
--- a/metadata/md5-cache/acct-user/ldap-0
+++ b/metadata/md5-cache/acct-user/ldap-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ldap
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d3708de6655d27fa665bf33091712f45
diff --git a/metadata/md5-cache/acct-user/libreoffice-0 b/metadata/md5-cache/acct-user/libreoffice-0
index 4c9cc7e6decc..b96a121f1339 100644
--- a/metadata/md5-cache/acct-user/libreoffice-0
+++ b/metadata/md5-cache/acct-user/libreoffice-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/libreoffice
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6c75b947bbe8ccf755f9953ff8b8159b
diff --git a/metadata/md5-cache/acct-user/lightdm-0 b/metadata/md5-cache/acct-user/lightdm-0
index e506e357c51f..bdf957b6b4b0 100644
--- a/metadata/md5-cache/acct-user/lightdm-0
+++ b/metadata/md5-cache/acct-user/lightdm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/lightdm acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dba4f39194dfaa6516e36be4094a8378
diff --git a/metadata/md5-cache/acct-user/lighttpd-0-r1 b/metadata/md5-cache/acct-user/lighttpd-0-r1
index 00b5d05c5b0b..e69919cd4622 100644
--- a/metadata/md5-cache/acct-user/lighttpd-0-r1
+++ b/metadata/md5-cache/acct-user/lighttpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/lighttpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a59ead6de77457aacb7b168bd38c53ed
diff --git a/metadata/md5-cache/acct-user/litecoin-0 b/metadata/md5-cache/acct-user/litecoin-0
index 9947a065db44..db8ba040373b 100644
--- a/metadata/md5-cache/acct-user/litecoin-0
+++ b/metadata/md5-cache/acct-user/litecoin-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/litecoin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc6b8835fc0e4e2e7dd33e38bb05b4b3
diff --git a/metadata/md5-cache/acct-user/lldpd-0-r1 b/metadata/md5-cache/acct-user/lldpd-0-r1
index 0fb4a7b8f1ef..0651b9a1cd2e 100644
--- a/metadata/md5-cache/acct-user/lldpd-0-r1
+++ b/metadata/md5-cache/acct-user/lldpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/lldpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9cf92a8d94054e18694e86da9a985048
diff --git a/metadata/md5-cache/acct-user/logcheck-0 b/metadata/md5-cache/acct-user/logcheck-0
index 241feaf57ba1..c8e2c5b676cb 100644
--- a/metadata/md5-cache/acct-user/logcheck-0
+++ b/metadata/md5-cache/acct-user/logcheck-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/logcheck
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=89d38b7b044686504ba87dd51b0707eb
diff --git a/metadata/md5-cache/acct-user/logstash-0-r1 b/metadata/md5-cache/acct-user/logstash-0-r1
index 127f346d99cc..04e5bc34e4af 100644
--- a/metadata/md5-cache/acct-user/logstash-0-r1
+++ b/metadata/md5-cache/acct-user/logstash-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/logstash
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=959dfc2072179dcf62baf844c87071d5
diff --git a/metadata/md5-cache/acct-user/logsurfer-0 b/metadata/md5-cache/acct-user/logsurfer-0
index 79833169bfa4..e48ba1a41f3f 100644
--- a/metadata/md5-cache/acct-user/logsurfer-0
+++ b/metadata/md5-cache/acct-user/logsurfer-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/logsurfer
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5022c459e43422f5c03c7ee7de616a1a
diff --git a/metadata/md5-cache/acct-user/lxc-0 b/metadata/md5-cache/acct-user/lxc-0
index 7ff37bf83393..05a0f9a13aa2 100644
--- a/metadata/md5-cache/acct-user/lxc-0
+++ b/metadata/md5-cache/acct-user/lxc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/lxc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c2b36965ad3de82b54f7ee3ea28126e5
diff --git a/metadata/md5-cache/acct-user/mail-0-r1 b/metadata/md5-cache/acct-user/mail-0-r1
index 1ef291d78601..3b2ce1632e47 100644
--- a/metadata/md5-cache/acct-user/mail-0-r1
+++ b/metadata/md5-cache/acct-user/mail-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bb05bb64f66c9418d95e473c974bbb44
diff --git a/metadata/md5-cache/acct-user/man-1-r1 b/metadata/md5-cache/acct-user/man-1-r1
index 2eed2ea026bc..9fbc223c4d93 100644
--- a/metadata/md5-cache/acct-user/man-1-r1
+++ b/metadata/md5-cache/acct-user/man-1-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/man
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f1bb0b2061b8de3c31ac22a97078c082
diff --git a/metadata/md5-cache/acct-user/maradns-0-r1 b/metadata/md5-cache/acct-user/maradns-0-r1
index 80fc03e7cb98..cdaefe802411 100644
--- a/metadata/md5-cache/acct-user/maradns-0-r1
+++ b/metadata/md5-cache/acct-user/maradns-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/maradns
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0d1d57ff842cacbd17ae61bb849a6fa3
diff --git a/metadata/md5-cache/acct-user/memcached-0-r1 b/metadata/md5-cache/acct-user/memcached-0-r1
index 1a3ea8e89459..9a1074ee1b2a 100644
--- a/metadata/md5-cache/acct-user/memcached-0-r1
+++ b/metadata/md5-cache/acct-user/memcached-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/memcached
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=09dd2fd3cceb6e638f77c53828575dba
diff --git a/metadata/md5-cache/acct-user/memcached_exporter-0 b/metadata/md5-cache/acct-user/memcached_exporter-0
index 0b04194d4943..62af462dc665 100644
--- a/metadata/md5-cache/acct-user/memcached_exporter-0
+++ b/metadata/md5-cache/acct-user/memcached_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/memcached_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=79ac6b6ec2da1ed951f8c0629e838c14
diff --git a/metadata/md5-cache/acct-user/messagebus-0-r1 b/metadata/md5-cache/acct-user/messagebus-0-r1
index dd024a42054e..7ed6dd961515 100644
--- a/metadata/md5-cache/acct-user/messagebus-0-r1
+++ b/metadata/md5-cache/acct-user/messagebus-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/messagebus
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c94b03f063aee703c2fba80172adbec
diff --git a/metadata/md5-cache/acct-user/mgraph-0 b/metadata/md5-cache/acct-user/mgraph-0
index 10f252558694..095eb2186d67 100644
--- a/metadata/md5-cache/acct-user/mgraph-0
+++ b/metadata/md5-cache/acct-user/mgraph-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mgraph acct-group/adm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a206ba8bd86db9b8815e49ced1f361b7
diff --git a/metadata/md5-cache/acct-user/milter-regex-0-r1 b/metadata/md5-cache/acct-user/milter-regex-0-r1
index 8f72227a3f9c..5bed4db133be 100644
--- a/metadata/md5-cache/acct-user/milter-regex-0-r1
+++ b/metadata/md5-cache/acct-user/milter-regex-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/milter-regex
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a010221e9c80a8cd1e74fd545a56d33c
diff --git a/metadata/md5-cache/acct-user/minbif-0 b/metadata/md5-cache/acct-user/minbif-0
index 0ad86fd123b8..71c73d00fa68 100644
--- a/metadata/md5-cache/acct-user/minbif-0
+++ b/metadata/md5-cache/acct-user/minbif-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/minbif
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b63a77cfd87df4694de26f1246883407
diff --git a/metadata/md5-cache/acct-user/minecraft-0-r1 b/metadata/md5-cache/acct-user/minecraft-0-r1
index e5de5c93910b..d13a1c0660b2 100644
--- a/metadata/md5-cache/acct-user/minecraft-0-r1
+++ b/metadata/md5-cache/acct-user/minecraft-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/minecraft
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=027114ca3e5d54c2b7613ad3b5deb407
diff --git a/metadata/md5-cache/acct-user/minetest-1-r1 b/metadata/md5-cache/acct-user/minetest-1-r1
index 2c14fbdd6e1e..b98813ae37b0 100644
--- a/metadata/md5-cache/acct-user/minetest-1-r1
+++ b/metadata/md5-cache/acct-user/minetest-1-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/minetest
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=08e017c6a32d177006cadb452a673147
diff --git a/metadata/md5-cache/acct-user/minidlna-0 b/metadata/md5-cache/acct-user/minidlna-0
index 2f8979e98990..8aa248416a3f 100644
--- a/metadata/md5-cache/acct-user/minidlna-0
+++ b/metadata/md5-cache/acct-user/minidlna-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/minidlna
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=568763878748638d96eeb052812ed034
diff --git a/metadata/md5-cache/acct-user/miniflux-0 b/metadata/md5-cache/acct-user/miniflux-0
index 863ef934c0a0..f80bb8463014 100644
--- a/metadata/md5-cache/acct-user/miniflux-0
+++ b/metadata/md5-cache/acct-user/miniflux-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nobody
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f494a800ac5f2bc0510974edc9127ab6
diff --git a/metadata/md5-cache/acct-user/minio-0 b/metadata/md5-cache/acct-user/minio-0
index f285a9fcb244..9781f11a7ed8 100644
--- a/metadata/md5-cache/acct-user/minio-0
+++ b/metadata/md5-cache/acct-user/minio-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/minio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fd2637573aa1b6d76fd49391ded77082
diff --git a/metadata/md5-cache/acct-user/mogile-0 b/metadata/md5-cache/acct-user/mogile-0
index 1ad4f6753e02..e78ea4ba7d4e 100644
--- a/metadata/md5-cache/acct-user/mogile-0
+++ b/metadata/md5-cache/acct-user/mogile-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mogile
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ed25de7fec60192f627a12c91ec0d8de
diff --git a/metadata/md5-cache/acct-user/mongodb-0-r1 b/metadata/md5-cache/acct-user/mongodb-0-r1
index eb68e84b8ee6..9dafb99fd1c4 100644
--- a/metadata/md5-cache/acct-user/mongodb-0-r1
+++ b/metadata/md5-cache/acct-user/mongodb-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mongodb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=601866d39a5a012c543e2c88e5648611
diff --git a/metadata/md5-cache/acct-user/mongodb_exporter-0 b/metadata/md5-cache/acct-user/mongodb_exporter-0
index f8fb1c6f4126..e269acbac9ce 100644
--- a/metadata/md5-cache/acct-user/mongodb_exporter-0
+++ b/metadata/md5-cache/acct-user/mongodb_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mongodb_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b6fcf3627898d87f7464fb9d2ff21b07
diff --git a/metadata/md5-cache/acct-user/monitorix-0-r1 b/metadata/md5-cache/acct-user/monitorix-0-r1
index d38d5cc5340c..7251a5bfe597 100644
--- a/metadata/md5-cache/acct-user/monitorix-0-r1
+++ b/metadata/md5-cache/acct-user/monitorix-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/monitorix
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cf33618dd6efc727570b7f7e7312babf
diff --git a/metadata/md5-cache/acct-user/monkeyd-0 b/metadata/md5-cache/acct-user/monkeyd-0
index 3ca43a495a37..bc767cb05a1d 100644
--- a/metadata/md5-cache/acct-user/monkeyd-0
+++ b/metadata/md5-cache/acct-user/monkeyd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/monkeyd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=94b756967fe12cbb5adaaa57eafb487d
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0-r1 b/metadata/md5-cache/acct-user/monkeysphere-0-r1
index a67c7b186106..10e4d8e51f41 100644
--- a/metadata/md5-cache/acct-user/monkeysphere-0-r1
+++ b/metadata/md5-cache/acct-user/monkeysphere-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/monkeysphere
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cf64c76963a0f387e27ab91660a22138
diff --git a/metadata/md5-cache/acct-user/mosquitto-0-r1 b/metadata/md5-cache/acct-user/mosquitto-0-r1
index dfcc485ef38d..148d91a095d3 100644
--- a/metadata/md5-cache/acct-user/mosquitto-0-r1
+++ b/metadata/md5-cache/acct-user/mosquitto-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mosquitto
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c848acce312790800bec0711a0402e2c
diff --git a/metadata/md5-cache/acct-user/motion-0-r1 b/metadata/md5-cache/acct-user/motion-0-r1
index 5ee0c9ebfa5d..147c8c4d6aae 100644
--- a/metadata/md5-cache/acct-user/motion-0-r1
+++ b/metadata/md5-cache/acct-user/motion-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/motion acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9a6a7905a6682b51b9984aa63c558b09
diff --git a/metadata/md5-cache/acct-user/mpd-0-r1 b/metadata/md5-cache/acct-user/mpd-0-r1
index b920330a513f..5277dd9c11fc 100644
--- a/metadata/md5-cache/acct-user/mpd-0-r1
+++ b/metadata/md5-cache/acct-user/mpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/audio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6ddca8eb3f013ebcc84913721712b86b
diff --git a/metadata/md5-cache/acct-user/msmtpd-0-r1 b/metadata/md5-cache/acct-user/msmtpd-0-r1
index a2c6f5ff3c95..f9ec20c845b2 100644
--- a/metadata/md5-cache/acct-user/msmtpd-0-r1
+++ b/metadata/md5-cache/acct-user/msmtpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/msmtpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a0df89c403b68c835be661281617b459
diff --git a/metadata/md5-cache/acct-user/munge-0 b/metadata/md5-cache/acct-user/munge-0
index ad8929d302c2..37e3da0f2b66 100644
--- a/metadata/md5-cache/acct-user/munge-0
+++ b/metadata/md5-cache/acct-user/munge-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/munge
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e95e51d8ee577c03505c085f675dbf41
diff --git a/metadata/md5-cache/acct-user/munin-0-r1 b/metadata/md5-cache/acct-user/munin-0-r1
index a57d9ee3f0a7..31ae9bbbe50b 100644
--- a/metadata/md5-cache/acct-user/munin-0-r1
+++ b/metadata/md5-cache/acct-user/munin-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/munin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=33fc97d24aadb33e3bb9947ff0dddfa2
diff --git a/metadata/md5-cache/acct-user/munin-async-0-r1 b/metadata/md5-cache/acct-user/munin-async-0-r1
index 55cf3faff3ad..566c6674b2e4 100644
--- a/metadata/md5-cache/acct-user/munin-async-0-r1
+++ b/metadata/md5-cache/acct-user/munin-async-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/munin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=430b4cb7cc1707fb55d8bc55ae97c413
diff --git a/metadata/md5-cache/acct-user/murmur-0-r1 b/metadata/md5-cache/acct-user/murmur-0-r1
index 4dbb5c2a017e..0fbb614c0f83 100644
--- a/metadata/md5-cache/acct-user/murmur-0-r1
+++ b/metadata/md5-cache/acct-user/murmur-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/murmur
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=42ba66759f91dd8851bcad19aeac7366
diff --git a/metadata/md5-cache/acct-user/mysql-0-r1 b/metadata/md5-cache/acct-user/mysql-0-r1
index 665b2c807120..4e6e425eb158 100644
--- a/metadata/md5-cache/acct-user/mysql-0-r1
+++ b/metadata/md5-cache/acct-user/mysql-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mysql
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9cabf9fffe5a4f75a5618b1676743afc
diff --git a/metadata/md5-cache/acct-user/mysqld_exporter-0-r1 b/metadata/md5-cache/acct-user/mysqld_exporter-0-r1
index 6bf19ee59d5a..45690f369ef9 100644
--- a/metadata/md5-cache/acct-user/mysqld_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/mysqld_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mysqld_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f40a5ce40ccc4a40455de843f68f1e08
diff --git a/metadata/md5-cache/acct-user/mythtv-0-r1 b/metadata/md5-cache/acct-user/mythtv-0-r1
index addfe5ec2dfe..1f0a91f4de6a 100644
--- a/metadata/md5-cache/acct-user/mythtv-0-r1
+++ b/metadata/md5-cache/acct-user/mythtv-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a9ce2f5bdb114729cadd7c4e70ba73d4
diff --git a/metadata/md5-cache/acct-user/nagios-0-r1 b/metadata/md5-cache/acct-user/nagios-0-r1
index 6944b6456905..36385b6e17a7 100644
--- a/metadata/md5-cache/acct-user/nagios-0-r1
+++ b/metadata/md5-cache/acct-user/nagios-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nagios
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8583f9acf3e2d3f01c1055593828839b
diff --git a/metadata/md5-cache/acct-user/named-0-r1 b/metadata/md5-cache/acct-user/named-0-r1
index e6f850f8a52d..560cc951fbec 100644
--- a/metadata/md5-cache/acct-user/named-0-r1
+++ b/metadata/md5-cache/acct-user/named-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/named
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7967879b542cd86455e607528225513a
diff --git a/metadata/md5-cache/acct-user/netbox-0-r1 b/metadata/md5-cache/acct-user/netbox-0-r1
index 872deb4809da..a5bf1526190d 100644
--- a/metadata/md5-cache/acct-user/netbox-0-r1
+++ b/metadata/md5-cache/acct-user/netbox-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/netbox
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7576a9a5839d05ecefdb466a6d9d8972
diff --git a/metadata/md5-cache/acct-user/netdata-1 b/metadata/md5-cache/acct-user/netdata-1
index 7d8c1e1aafe7..e99e09db1593 100644
--- a/metadata/md5-cache/acct-user/netdata-1
+++ b/metadata/md5-cache/acct-user/netdata-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/netdata
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=28ed0b57a147eaf51ceb3b83c166c27d
diff --git a/metadata/md5-cache/acct-user/netperf-0 b/metadata/md5-cache/acct-user/netperf-0
index 8461f0174594..9e16d1742089 100644
--- a/metadata/md5-cache/acct-user/netperf-0
+++ b/metadata/md5-cache/acct-user/netperf-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/netperf
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dbda66e6e1bb22cd52211ce5eef82e50
diff --git a/metadata/md5-cache/acct-user/neutron-0-r1 b/metadata/md5-cache/acct-user/neutron-0-r1
index 05a33bd734e6..7ecd617d5520 100644
--- a/metadata/md5-cache/acct-user/neutron-0-r1
+++ b/metadata/md5-cache/acct-user/neutron-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/neutron
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a97deaa3ef65b7cd8085c81caaa2ac4e
diff --git a/metadata/md5-cache/acct-user/nginx-0 b/metadata/md5-cache/acct-user/nginx-0
index 7ac70a9dc796..148e12363039 100644
--- a/metadata/md5-cache/acct-user/nginx-0
+++ b/metadata/md5-cache/acct-user/nginx-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nginx
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=90af3dd27cdabdbf7767ed2bdbb28efb
diff --git a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1 b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
index 02acfd64bcf1..96824f7df4e0 100644
--- a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
+++ b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nginx-vts-exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a56a4c1fa44a45183ea8632919357429
diff --git a/metadata/md5-cache/acct-user/ngircd-0-r1 b/metadata/md5-cache/acct-user/ngircd-0-r1
index 69e054ebb650..8f69dfe75a37 100644
--- a/metadata/md5-cache/acct-user/ngircd-0-r1
+++ b/metadata/md5-cache/acct-user/ngircd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ngircd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=17ace4c3bf01519f0ce34a5a8993a325
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r1 b/metadata/md5-cache/acct-user/ngrep-0-r1
index 1b8031c8ab4a..a4644c156d53 100644
--- a/metadata/md5-cache/acct-user/ngrep-0-r1
+++ b/metadata/md5-cache/acct-user/ngrep-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ngrep
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1467c1cd405ff0a40d0560fe998b20be
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0 b/metadata/md5-cache/acct-user/nm-openconnect-0
index fdd012ed9fa0..cbd4a2ddc552 100644
--- a/metadata/md5-cache/acct-user/nm-openconnect-0
+++ b/metadata/md5-cache/acct-user/nm-openconnect-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nm-openconnect
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=63065cf78508e8ec5e09aab52f51685f
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0 b/metadata/md5-cache/acct-user/nm-openvpn-0
index 22eacebbed3e..a7449b73372c 100644
--- a/metadata/md5-cache/acct-user/nm-openvpn-0
+++ b/metadata/md5-cache/acct-user/nm-openvpn-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nm-openvpn
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4927ffdf1a2a6f32a90e602952917260
diff --git a/metadata/md5-cache/acct-user/nobody-0 b/metadata/md5-cache/acct-user/nobody-0
index f6486083e6ce..191c609db801 100644
--- a/metadata/md5-cache/acct-user/nobody-0
+++ b/metadata/md5-cache/acct-user/nobody-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nobody acct-user/root
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=816eb3d51b7c839f67ae1febd90bd6d1
diff --git a/metadata/md5-cache/acct-user/node_exporter-0-r1 b/metadata/md5-cache/acct-user/node_exporter-0-r1
index baeb1068dfae..f1728e8c51a2 100644
--- a/metadata/md5-cache/acct-user/node_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/node_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/node_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d778fc3a09c99b8386e1db641a763b9a
diff --git a/metadata/md5-cache/acct-user/notary-0 b/metadata/md5-cache/acct-user/notary-0
index 5b48ac7bbf48..b5a5ebae8594 100644
--- a/metadata/md5-cache/acct-user/notary-0
+++ b/metadata/md5-cache/acct-user/notary-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/notary
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7aed91b82d426f8c2ba2aa290a53de9b
diff --git a/metadata/md5-cache/acct-user/nova-0-r1 b/metadata/md5-cache/acct-user/nova-0-r1
index d87beae84f7c..8e236b2984a9 100644
--- a/metadata/md5-cache/acct-user/nova-0-r1
+++ b/metadata/md5-cache/acct-user/nova-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nova
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f97663b2cf9abbd1a770cda5d05a4ad0
diff --git a/metadata/md5-cache/acct-user/nsd-0-r1 b/metadata/md5-cache/acct-user/nsd-0-r1
index 5cdca28a989a..2ed19610e14c 100644
--- a/metadata/md5-cache/acct-user/nsd-0-r1
+++ b/metadata/md5-cache/acct-user/nsd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nsd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=816d3193fe33e5c1aede678bcaf4439a
diff --git a/metadata/md5-cache/acct-user/nslcd-0-r1 b/metadata/md5-cache/acct-user/nslcd-0-r1
index e08269f335d5..c01819c2b4bf 100644
--- a/metadata/md5-cache/acct-user/nslcd-0-r1
+++ b/metadata/md5-cache/acct-user/nslcd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nslcd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b4891d75ca03c228b9aac53382da2850
diff --git a/metadata/md5-cache/acct-user/ntopng-0 b/metadata/md5-cache/acct-user/ntopng-0
index cc63535f88f7..64d9c1e78c8a 100644
--- a/metadata/md5-cache/acct-user/ntopng-0
+++ b/metadata/md5-cache/acct-user/ntopng-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ntopng
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f9530dca7147a8f8db81067e2a54f72d
diff --git a/metadata/md5-cache/acct-user/ntp-0-r1 b/metadata/md5-cache/acct-user/ntp-0-r1
index a933f324c914..d20021750953 100644
--- a/metadata/md5-cache/acct-user/ntp-0-r1
+++ b/metadata/md5-cache/acct-user/ntp-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ntp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=57856c55cbef6893441aa052618fae40
diff --git a/metadata/md5-cache/acct-user/nullmail-0 b/metadata/md5-cache/acct-user/nullmail-0
index f73966c0719b..987af5096da7 100644
--- a/metadata/md5-cache/acct-user/nullmail-0
+++ b/metadata/md5-cache/acct-user/nullmail-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nullmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cf7721392d184d4b2b8088bbde3b79a4
diff --git a/metadata/md5-cache/acct-user/nut-0-r1 b/metadata/md5-cache/acct-user/nut-0-r1
index 29092da06bca..8e0957581e72 100644
--- a/metadata/md5-cache/acct-user/nut-0-r1
+++ b/metadata/md5-cache/acct-user/nut-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nut acct-group/uucp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=878629348f905d79b5f7fb5fee10b52a
diff --git a/metadata/md5-cache/acct-user/nvpd-0 b/metadata/md5-cache/acct-user/nvpd-0
index f00f97159f76..6fafeafbb2f0 100644
--- a/metadata/md5-cache/acct-user/nvpd-0
+++ b/metadata/md5-cache/acct-user/nvpd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9459b202f51b8f5599dabce749867981
diff --git a/metadata/md5-cache/acct-user/nzbget-0 b/metadata/md5-cache/acct-user/nzbget-0
index 14f8083bd672..20e2d9afb6f7 100644
--- a/metadata/md5-cache/acct-user/nzbget-0
+++ b/metadata/md5-cache/acct-user/nzbget-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nzbget
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=67b53d8b00ceec66d072e25b08c1c994
diff --git a/metadata/md5-cache/acct-user/oidentd-0-r1 b/metadata/md5-cache/acct-user/oidentd-0-r1
index 6581911b6c4c..a4a57b110b3c 100644
--- a/metadata/md5-cache/acct-user/oidentd-0-r1
+++ b/metadata/md5-cache/acct-user/oidentd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/oidentd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eb0ab619c6874e1d70482c66ac70b5a2
diff --git a/metadata/md5-cache/acct-user/openctd-0 b/metadata/md5-cache/acct-user/openctd-0
index 6e1376ccb048..5f330b6392b0 100644
--- a/metadata/md5-cache/acct-user/openctd-0
+++ b/metadata/md5-cache/acct-user/openctd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openct
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f351d816fed92fcc82ab99b9a9c2f38
diff --git a/metadata/md5-cache/acct-user/opendkim-0-r1 b/metadata/md5-cache/acct-user/opendkim-0-r1
index e46d27a6f297..73326f8eef30 100644
--- a/metadata/md5-cache/acct-user/opendkim-0-r1
+++ b/metadata/md5-cache/acct-user/opendkim-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/opendkim
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7168bc00504be62b4a4cad7dabdac216
diff --git a/metadata/md5-cache/acct-user/opendmarc-0 b/metadata/md5-cache/acct-user/opendmarc-0
index 97a6fbf3ebda..d2da5dfe1bb2 100644
--- a/metadata/md5-cache/acct-user/opendmarc-0
+++ b/metadata/md5-cache/acct-user/opendmarc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/opendmarc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=48e8fb549b651417c87f30cf005dbe81
diff --git a/metadata/md5-cache/acct-user/opendnssec-0 b/metadata/md5-cache/acct-user/opendnssec-0
index b8cb73b4d81c..af567032347b 100644
--- a/metadata/md5-cache/acct-user/opendnssec-0
+++ b/metadata/md5-cache/acct-user/opendnssec-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/opendnssec
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6f6647d11fee25a9625dea44298db219
diff --git a/metadata/md5-cache/acct-user/openntpd-0-r1 b/metadata/md5-cache/acct-user/openntpd-0-r1
index e6d34d88b391..b8ee24cc9586 100644
--- a/metadata/md5-cache/acct-user/openntpd-0-r1
+++ b/metadata/md5-cache/acct-user/openntpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openntpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=52804713097b1827440394b94808c25d
diff --git a/metadata/md5-cache/acct-user/openrct2-0-r1 b/metadata/md5-cache/acct-user/openrct2-0-r1
index 6a158fb001c0..57da4d7a88c3 100644
--- a/metadata/md5-cache/acct-user/openrct2-0-r1
+++ b/metadata/md5-cache/acct-user/openrct2-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openrct2
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=780673639d3bf2ac0234c12eb6c891e9
diff --git a/metadata/md5-cache/acct-user/openttd-0 b/metadata/md5-cache/acct-user/openttd-0
index 45d96cc470dc..50ca44a1cddf 100644
--- a/metadata/md5-cache/acct-user/openttd-0
+++ b/metadata/md5-cache/acct-user/openttd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openttd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a0055f41a5daa9904a917986522f7fd0
diff --git a/metadata/md5-cache/acct-user/openvpn-0-r1 b/metadata/md5-cache/acct-user/openvpn-0-r1
index 0fad0e98f6c3..3ddd6dffad75 100644
--- a/metadata/md5-cache/acct-user/openvpn-0-r1
+++ b/metadata/md5-cache/acct-user/openvpn-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openvpn
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=421c0ea56908184887566fb94caaa733
diff --git a/metadata/md5-cache/acct-user/openvpn_exporter-0-r1 b/metadata/md5-cache/acct-user/openvpn_exporter-0-r1
index 842998881ac2..c2ffbdd1d11f 100644
--- a/metadata/md5-cache/acct-user/openvpn_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/openvpn_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/openvpn_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e1faf6421e4d3f4c37e0945b78c5f2f
diff --git a/metadata/md5-cache/acct-user/opm-0-r1 b/metadata/md5-cache/acct-user/opm-0-r1
index 34c95513da5d..a61f3e44cd91 100644
--- a/metadata/md5-cache/acct-user/opm-0-r1
+++ b/metadata/md5-cache/acct-user/opm-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/opm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=82b017c2325ea9391eb65e445803d031
diff --git a/metadata/md5-cache/acct-user/oprofile-0-r1 b/metadata/md5-cache/acct-user/oprofile-0-r1
index 3789ede7dd7e..5a223ea42538 100644
--- a/metadata/md5-cache/acct-user/oprofile-0-r1
+++ b/metadata/md5-cache/acct-user/oprofile-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/oprofile
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eb4712745ce81a80155b2a188fff4f2f
diff --git a/metadata/md5-cache/acct-user/oragono-0 b/metadata/md5-cache/acct-user/oragono-0
index a98e0faa6318..627697eabc93 100644
--- a/metadata/md5-cache/acct-user/oragono-0
+++ b/metadata/md5-cache/acct-user/oragono-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/oragono
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=67efe51d87d1d3b5feaba941e1e36da7
diff --git a/metadata/md5-cache/acct-user/ossec-0-r1 b/metadata/md5-cache/acct-user/ossec-0-r1
index c771c690102c..1bd33d08007a 100644
--- a/metadata/md5-cache/acct-user/ossec-0-r1
+++ b/metadata/md5-cache/acct-user/ossec-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ossec
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f6b0f9e703368a37306c92be4fbd65e7
diff --git a/metadata/md5-cache/acct-user/ossecm-0-r1 b/metadata/md5-cache/acct-user/ossecm-0-r1
index 50a452e0f9f7..ab084a2e977e 100644
--- a/metadata/md5-cache/acct-user/ossecm-0-r1
+++ b/metadata/md5-cache/acct-user/ossecm-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ossec
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ac6a55a88e2a142399b8aacb83aa6587
diff --git a/metadata/md5-cache/acct-user/ossecr-0-r1 b/metadata/md5-cache/acct-user/ossecr-0-r1
index 166a946ee68a..16d13503d243 100644
--- a/metadata/md5-cache/acct-user/ossecr-0-r1
+++ b/metadata/md5-cache/acct-user/ossecr-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ossec
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=41b8f3fd1fee1b78a619d3be3dfae343
diff --git a/metadata/md5-cache/acct-user/p2p-0 b/metadata/md5-cache/acct-user/p2p-0
index 08dae51c65ad..4b3a32547ac5 100644
--- a/metadata/md5-cache/acct-user/p2p-0
+++ b/metadata/md5-cache/acct-user/p2p-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/p2p
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=68a830d2f31aa89fe04588493c193713
diff --git a/metadata/md5-cache/acct-user/partimag-0 b/metadata/md5-cache/acct-user/partimag-0
index 90fcfe24776a..16e031cd0090 100644
--- a/metadata/md5-cache/acct-user/partimag-0
+++ b/metadata/md5-cache/acct-user/partimag-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/partimag
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d33ef001c2aaadef77a868064026574e
diff --git a/metadata/md5-cache/acct-user/pcap-0 b/metadata/md5-cache/acct-user/pcap-0
index 121725dc69c9..ed297b2d8a2f 100644
--- a/metadata/md5-cache/acct-user/pcap-0
+++ b/metadata/md5-cache/acct-user/pcap-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pcap
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c3d6daf46137a4c7ee2ae752983a13d6
diff --git a/metadata/md5-cache/acct-user/pcscd-0-r1 b/metadata/md5-cache/acct-user/pcscd-0-r1
index b2922ed98028..7a3706ef7dbc 100644
--- a/metadata/md5-cache/acct-user/pcscd-0-r1
+++ b/metadata/md5-cache/acct-user/pcscd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pcscd acct-group/openct acct-group/usb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c5cad9823484267ce60585127ed6f723
diff --git a/metadata/md5-cache/acct-user/pdns-0-r1 b/metadata/md5-cache/acct-user/pdns-0-r1
index 0dce1c745818..f3c11415166b 100644
--- a/metadata/md5-cache/acct-user/pdns-0-r1
+++ b/metadata/md5-cache/acct-user/pdns-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pdns
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=69badd6190a0158ef68dbddc5e230688
diff --git a/metadata/md5-cache/acct-user/pdnsd-0-r1 b/metadata/md5-cache/acct-user/pdnsd-0-r1
index 7f1c9fe25cc5..743abb1e57a4 100644
--- a/metadata/md5-cache/acct-user/pdnsd-0-r1
+++ b/metadata/md5-cache/acct-user/pdnsd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pdnsd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4369da0310b095c3edf76308af00e9e0
diff --git a/metadata/md5-cache/acct-user/pgagent-0 b/metadata/md5-cache/acct-user/pgagent-0
index f43dc6ac3894..eac2075639d1 100644
--- a/metadata/md5-cache/acct-user/pgagent-0
+++ b/metadata/md5-cache/acct-user/pgagent-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pgagent
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f09b944e4bcf05369c02def5bfb42a05
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0 b/metadata/md5-cache/acct-user/pgbouncer-0
index ec9dfe3e9139..f0612b09b893 100644
--- a/metadata/md5-cache/acct-user/pgbouncer-0
+++ b/metadata/md5-cache/acct-user/pgbouncer-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postgres
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=520fef38f21adc79848ca43748e86b02
diff --git a/metadata/md5-cache/acct-user/pgpool-0 b/metadata/md5-cache/acct-user/pgpool-0
index b5a7d98c44e8..85aa8c8e4945 100644
--- a/metadata/md5-cache/acct-user/pgpool-0
+++ b/metadata/md5-cache/acct-user/pgpool-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postgres
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5a134184568567cde73f00b1aca1f814
diff --git a/metadata/md5-cache/acct-user/pipewire-0 b/metadata/md5-cache/acct-user/pipewire-0
index c41d50befa3b..d33cb304a58f 100644
--- a/metadata/md5-cache/acct-user/pipewire-0
+++ b/metadata/md5-cache/acct-user/pipewire-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pipewire acct-group/audio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=db6898ee64da9b97b88b1fa07accc0cf
diff --git a/metadata/md5-cache/acct-user/placement-0-r1 b/metadata/md5-cache/acct-user/placement-0-r1
index 6c2d29a6eaa3..fd12e7e6600f 100644
--- a/metadata/md5-cache/acct-user/placement-0-r1
+++ b/metadata/md5-cache/acct-user/placement-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/placement
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=504e2951bc35a7a7cc780250b0ea85c5
diff --git a/metadata/md5-cache/acct-user/plex-0-r1 b/metadata/md5-cache/acct-user/plex-0-r1
index 9b4687b5b368..c0fb6e9b374d 100644
--- a/metadata/md5-cache/acct-user/plex-0-r1
+++ b/metadata/md5-cache/acct-user/plex-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/plex acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ef1223f5756854027a7a112bd8b6e297
diff --git a/metadata/md5-cache/acct-user/polkitd-0-r1 b/metadata/md5-cache/acct-user/polkitd-0-r1
index d4a7f0f682e1..d2d5d42764e9 100644
--- a/metadata/md5-cache/acct-user/polkitd-0-r1
+++ b/metadata/md5-cache/acct-user/polkitd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/polkitd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dddcb00c8b8baca2a30d547eb71d0cbb
diff --git a/metadata/md5-cache/acct-user/polw-0 b/metadata/md5-cache/acct-user/polw-0
index 71c08fac345f..ed10928e1ce4 100644
--- a/metadata/md5-cache/acct-user/polw-0
+++ b/metadata/md5-cache/acct-user/polw-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/polw
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5600b4cd7d207fc62e7650d64ea32fe0
diff --git a/metadata/md5-cache/acct-user/popa3d-0 b/metadata/md5-cache/acct-user/popa3d-0
index 46e29e134f0c..c1e0430a5f21 100644
--- a/metadata/md5-cache/acct-user/popa3d-0
+++ b/metadata/md5-cache/acct-user/popa3d-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/popa3d
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=99527ff6b307c51b82f581a26a7d0d75
diff --git a/metadata/md5-cache/acct-user/portage-0 b/metadata/md5-cache/acct-user/portage-0
index ff3b988572ed..60caf1b73808 100644
--- a/metadata/md5-cache/acct-user/portage-0
+++ b/metadata/md5-cache/acct-user/portage-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/portage
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e940748af44df235e34bacc52c98190d
diff --git a/metadata/md5-cache/acct-user/postfix-0-r1 b/metadata/md5-cache/acct-user/postfix-0-r1
index 137106189550..503e3bb2f79e 100644
--- a/metadata/md5-cache/acct-user/postfix-0-r1
+++ b/metadata/md5-cache/acct-user/postfix-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postfix acct-group/mail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f4dbc4a57bfb59b3d83ea164324dba3f
diff --git a/metadata/md5-cache/acct-user/postfix_exporter-0-r1 b/metadata/md5-cache/acct-user/postfix_exporter-0-r1
index ee354d3017a8..ca9e0f43af8f 100644
--- a/metadata/md5-cache/acct-user/postfix_exporter-0-r1
+++ b/metadata/md5-cache/acct-user/postfix_exporter-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postfix_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=034edf7db06f7a51bb24582e6b668bd4
diff --git a/metadata/md5-cache/acct-user/postfwd-0 b/metadata/md5-cache/acct-user/postfwd-0
index 8c3723a07fc6..135445abafc0 100644
--- a/metadata/md5-cache/acct-user/postfwd-0
+++ b/metadata/md5-cache/acct-user/postfwd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postfwd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c6211055da29b42d5c010e16493bddbd
diff --git a/metadata/md5-cache/acct-user/postgres-0-r1 b/metadata/md5-cache/acct-user/postgres-0-r1
index 9083f52570ce..6ca370203d3e 100644
--- a/metadata/md5-cache/acct-user/postgres-0-r1
+++ b/metadata/md5-cache/acct-user/postgres-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postgres
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=00dfa89c3e86d7c05cad6a2f3d328eb6
diff --git a/metadata/md5-cache/acct-user/postgres_exporter-0 b/metadata/md5-cache/acct-user/postgres_exporter-0
index 9a0f0d7b7485..4698631b1147 100644
--- a/metadata/md5-cache/acct-user/postgres_exporter-0
+++ b/metadata/md5-cache/acct-user/postgres_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postgres_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2edc0c4db0d58066f8f4491237473ac8
diff --git a/metadata/md5-cache/acct-user/postgrey-0 b/metadata/md5-cache/acct-user/postgrey-0
index 180368d28f63..54b42cfed31a 100644
--- a/metadata/md5-cache/acct-user/postgrey-0
+++ b/metadata/md5-cache/acct-user/postgrey-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/postgrey
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cfcc3d7a572a262aa757734ecfd3e0f9
diff --git a/metadata/md5-cache/acct-user/postmaster-0-r1 b/metadata/md5-cache/acct-user/postmaster-0-r1
index 493c70ffe93e..23b4af6380f8 100644
--- a/metadata/md5-cache/acct-user/postmaster-0-r1
+++ b/metadata/md5-cache/acct-user/postmaster-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e851b4448be51b93a8bc9bd003572c5e
diff --git a/metadata/md5-cache/acct-user/privoxy-0-r1 b/metadata/md5-cache/acct-user/privoxy-0-r1
index 6104af5596b6..a108f8d74494 100644
--- a/metadata/md5-cache/acct-user/privoxy-0-r1
+++ b/metadata/md5-cache/acct-user/privoxy-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/privoxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8df0bf68d01e7064f875a2ae3f9cc0b3
diff --git a/metadata/md5-cache/acct-user/prometheus-0-r1 b/metadata/md5-cache/acct-user/prometheus-0-r1
index d8bb46eb989a..f7bf699577b1 100644
--- a/metadata/md5-cache/acct-user/prometheus-0-r1
+++ b/metadata/md5-cache/acct-user/prometheus-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/prometheus
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f6c97821a2a4bd2fdfb1f2489403ca4
diff --git a/metadata/md5-cache/acct-user/prosody-0 b/metadata/md5-cache/acct-user/prosody-0
index 496b0cb2ea7a..fa7c889cad9c 100644
--- a/metadata/md5-cache/acct-user/prosody-0
+++ b/metadata/md5-cache/acct-user/prosody-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/prosody
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7e24ef65ba8e87512b26c231d29346d6
diff --git a/metadata/md5-cache/acct-user/psybnc-0 b/metadata/md5-cache/acct-user/psybnc-0
index d022c9f31cce..86074e819c9e 100644
--- a/metadata/md5-cache/acct-user/psybnc-0
+++ b/metadata/md5-cache/acct-user/psybnc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/psybnc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=06187d4ccf7b3eed6030a2c18f59c110
diff --git a/metadata/md5-cache/acct-user/pulse-0 b/metadata/md5-cache/acct-user/pulse-0
index a78d4f892cc8..cf06332ed73b 100644
--- a/metadata/md5-cache/acct-user/pulse-0
+++ b/metadata/md5-cache/acct-user/pulse-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pulse acct-group/audio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b2d41bbc13bef4e5284ec6a9723c164f
diff --git a/metadata/md5-cache/acct-user/puppet-0-r1 b/metadata/md5-cache/acct-user/puppet-0-r1
index a56a651cce44..4a7c212212f0 100644
--- a/metadata/md5-cache/acct-user/puppet-0-r1
+++ b/metadata/md5-cache/acct-user/puppet-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/puppet
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bc15fcfef0d51555047209d3115d2438
diff --git a/metadata/md5-cache/acct-user/puppetdb-0-r1 b/metadata/md5-cache/acct-user/puppetdb-0-r1
index fc99f00d92e4..101694594f85 100644
--- a/metadata/md5-cache/acct-user/puppetdb-0-r1
+++ b/metadata/md5-cache/acct-user/puppetdb-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/puppetdb
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=85c625a10647b07be704defb5caaae20
diff --git a/metadata/md5-cache/acct-user/pushgateway-0 b/metadata/md5-cache/acct-user/pushgateway-0
index 0d11a7ffb2b9..cd674c47fc48 100644
--- a/metadata/md5-cache/acct-user/pushgateway-0
+++ b/metadata/md5-cache/acct-user/pushgateway-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pushgateway
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bc6d33f7e01abe59db15140d536e13ef
diff --git a/metadata/md5-cache/acct-user/pvpgn-0 b/metadata/md5-cache/acct-user/pvpgn-0
index 27fe084c4dbb..b04a7436762d 100644
--- a/metadata/md5-cache/acct-user/pvpgn-0
+++ b/metadata/md5-cache/acct-user/pvpgn-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/pvpgn
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8b7c45afbac936739b49978021efb93e
diff --git a/metadata/md5-cache/acct-user/qemu-0-r1 b/metadata/md5-cache/acct-user/qemu-0-r1
index 660604490b4e..b9bed643d8b3 100644
--- a/metadata/md5-cache/acct-user/qemu-0-r1
+++ b/metadata/md5-cache/acct-user/qemu-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/qemu acct-group/kvm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e9ed90f0240d0a260b1942de7298395c
diff --git a/metadata/md5-cache/acct-user/qmaild-0-r1 b/metadata/md5-cache/acct-user/qmaild-0-r1
index 2da11fe80af9..5b8f6d58a1ba 100644
--- a/metadata/md5-cache/acct-user/qmaild-0-r1
+++ b/metadata/md5-cache/acct-user/qmaild-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=581b4c7b56e4b341ca7d1bbfa10081f7
diff --git a/metadata/md5-cache/acct-user/qmaill-0-r1 b/metadata/md5-cache/acct-user/qmaill-0-r1
index 72e3b7ee500f..8b13dd480edc 100644
--- a/metadata/md5-cache/acct-user/qmaill-0-r1
+++ b/metadata/md5-cache/acct-user/qmaill-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d028b00363e69075c41c197048d5a5a9
diff --git a/metadata/md5-cache/acct-user/qmailp-0-r1 b/metadata/md5-cache/acct-user/qmailp-0-r1
index 33cb84001575..0beb5a1c1139 100644
--- a/metadata/md5-cache/acct-user/qmailp-0-r1
+++ b/metadata/md5-cache/acct-user/qmailp-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=07477df152a07a71f53f89929a381b16
diff --git a/metadata/md5-cache/acct-user/qmailq-0-r1 b/metadata/md5-cache/acct-user/qmailq-0-r1
index 509664b9a21c..5c9fa7c5dd4c 100644
--- a/metadata/md5-cache/acct-user/qmailq-0-r1
+++ b/metadata/md5-cache/acct-user/qmailq-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7f039586834520c6a2353a00a066385b
diff --git a/metadata/md5-cache/acct-user/qmailr-0-r1 b/metadata/md5-cache/acct-user/qmailr-0-r1
index eb6b686893d8..701170b54eca 100644
--- a/metadata/md5-cache/acct-user/qmailr-0-r1
+++ b/metadata/md5-cache/acct-user/qmailr-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=10cec18930bd453c732b5767d9c21cc5
diff --git a/metadata/md5-cache/acct-user/qmails-0-r1 b/metadata/md5-cache/acct-user/qmails-0-r1
index 18c7b562a4fc..0e8b70cc14d7 100644
--- a/metadata/md5-cache/acct-user/qmails-0-r1
+++ b/metadata/md5-cache/acct-user/qmails-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=441030961a89c121a924464f7850f226
diff --git a/metadata/md5-cache/acct-user/quagga-0-r1 b/metadata/md5-cache/acct-user/quagga-0-r1
index dd744b37ee91..b4b55d713dc5 100644
--- a/metadata/md5-cache/acct-user/quagga-0-r1
+++ b/metadata/md5-cache/acct-user/quagga-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/quagga
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=956efff66e65b3a7acacdd78acbd006f
diff --git a/metadata/md5-cache/acct-user/quassel-0-r1 b/metadata/md5-cache/acct-user/quassel-0-r1
index 3eb5e708bb30..3543d698b2fe 100644
--- a/metadata/md5-cache/acct-user/quassel-0-r1
+++ b/metadata/md5-cache/acct-user/quassel-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/quassel
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c9c91fee67d39fbfe72bd53c25d72ee4
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0 b/metadata/md5-cache/acct-user/rabbitmq-0
index 8b50a41ec353..0fabdbbd29d4 100644
--- a/metadata/md5-cache/acct-user/rabbitmq-0
+++ b/metadata/md5-cache/acct-user/rabbitmq-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rabbitmq
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d467de7a64836dda882d58be82960873
diff --git a/metadata/md5-cache/acct-user/rabbitmq_exporter-0 b/metadata/md5-cache/acct-user/rabbitmq_exporter-0
index 86f0485abc40..59ac0a167e75 100644
--- a/metadata/md5-cache/acct-user/rabbitmq_exporter-0
+++ b/metadata/md5-cache/acct-user/rabbitmq_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rabbitmq_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3b9bc67847c9e4979633ad93609cc9dc
diff --git a/metadata/md5-cache/acct-user/radicale-0-r2 b/metadata/md5-cache/acct-user/radicale-0-r2
index 17a7fd658ae0..0e49afc893f0 100644
--- a/metadata/md5-cache/acct-user/radicale-0-r2
+++ b/metadata/md5-cache/acct-user/radicale-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/radicale
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5e9c3caee7d81e631e1fa334d98fac4e
diff --git a/metadata/md5-cache/acct-user/radius-0-r1 b/metadata/md5-cache/acct-user/radius-0-r1
index 506b8024eda5..c02445e766d4 100644
--- a/metadata/md5-cache/acct-user/radius-0-r1
+++ b/metadata/md5-cache/acct-user/radius-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/radius
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=896cffd69d0ad10a418a70ccbd812a5d
diff --git a/metadata/md5-cache/acct-user/radvd-0 b/metadata/md5-cache/acct-user/radvd-0
index d816251ad7a8..5ca0a86e1d77 100644
--- a/metadata/md5-cache/acct-user/radvd-0
+++ b/metadata/md5-cache/acct-user/radvd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/radvd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5dcf65fccc425e4d20fe820abed9db62
diff --git a/metadata/md5-cache/acct-user/rbldns-0-r1 b/metadata/md5-cache/acct-user/rbldns-0-r1
index 32e5c4a2d85d..0c83a2514cf3 100644
--- a/metadata/md5-cache/acct-user/rbldns-0-r1
+++ b/metadata/md5-cache/acct-user/rbldns-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rbldns
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=66c3cb3c3c849a76499fc70c3b4d6cbb
diff --git a/metadata/md5-cache/acct-user/rbot-0 b/metadata/md5-cache/acct-user/rbot-0
index 8fdec435b48c..ab6c3b12569c 100644
--- a/metadata/md5-cache/acct-user/rbot-0
+++ b/metadata/md5-cache/acct-user/rbot-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rbot
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=23149f84d3c38f70ad5235003d69a3ca
diff --git a/metadata/md5-cache/acct-user/redis-0-r1 b/metadata/md5-cache/acct-user/redis-0-r1
index 0d9914ccc2bf..acaf2aaf504d 100644
--- a/metadata/md5-cache/acct-user/redis-0-r1
+++ b/metadata/md5-cache/acct-user/redis-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/redis
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c0f2629fac01abdd0715941f029268c
diff --git a/metadata/md5-cache/acct-user/redis_exporter-0 b/metadata/md5-cache/acct-user/redis_exporter-0
index d0bcde487d87..24065f693f1a 100644
--- a/metadata/md5-cache/acct-user/redis_exporter-0
+++ b/metadata/md5-cache/acct-user/redis_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/redis_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8e18b9ab8e5309bd8b477f4593d76b2c
diff --git a/metadata/md5-cache/acct-user/redmine-0-r1 b/metadata/md5-cache/acct-user/redmine-0-r1
index 58a62712f7bc..e20b3437a06a 100644
--- a/metadata/md5-cache/acct-user/redmine-0-r1
+++ b/metadata/md5-cache/acct-user/redmine-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/redmine
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2633a51fa2d59ab28e73919b665ba9b2
diff --git a/metadata/md5-cache/acct-user/redsocks-0-r1 b/metadata/md5-cache/acct-user/redsocks-0-r1
index 31dfd0876a73..bd8f37dcd16d 100644
--- a/metadata/md5-cache/acct-user/redsocks-0-r1
+++ b/metadata/md5-cache/acct-user/redsocks-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/redsocks
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e3e374c71c79aa536ae22b49212576de
diff --git a/metadata/md5-cache/acct-user/reg-0-r1 b/metadata/md5-cache/acct-user/reg-0-r1
index d27f51d4ad3c..6b76ebb34874 100644
--- a/metadata/md5-cache/acct-user/reg-0-r1
+++ b/metadata/md5-cache/acct-user/reg-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/reg
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=7347d0add6604a30918d43831ded64db
diff --git a/metadata/md5-cache/acct-user/registry-0 b/metadata/md5-cache/acct-user/registry-0
index dec3eeda1d25..dcc4df450d69 100644
--- a/metadata/md5-cache/acct-user/registry-0
+++ b/metadata/md5-cache/acct-user/registry-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/registry
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=86758fc0dd85cfea438f94b34465206c
diff --git a/metadata/md5-cache/acct-user/root-0-r1 b/metadata/md5-cache/acct-user/root-0-r1
index 71ee9239dc07..449162923226 100644
--- a/metadata/md5-cache/acct-user/root-0-r1
+++ b/metadata/md5-cache/acct-user/root-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/root
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=12faf3228ff097150292798c74c32291
diff --git a/metadata/md5-cache/acct-user/ros-0 b/metadata/md5-cache/acct-user/ros-0
index b59327ed2539..00f715402aef 100644
--- a/metadata/md5-cache/acct-user/ros-0
+++ b/metadata/md5-cache/acct-user/ros-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ros
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ebdfff3b9efedc72e356ccd4beff34d9
diff --git a/metadata/md5-cache/acct-user/rplayd-0 b/metadata/md5-cache/acct-user/rplayd-0
index 03432939ec6b..019b1f8be560 100644
--- a/metadata/md5-cache/acct-user/rplayd-0
+++ b/metadata/md5-cache/acct-user/rplayd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rplayd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a97ed2fb7a50e381460a0f1b1787b52f
diff --git a/metadata/md5-cache/acct-user/rrdcached-0 b/metadata/md5-cache/acct-user/rrdcached-0
index ac2d5d1b4b2d..cfdb902d25ba 100644
--- a/metadata/md5-cache/acct-user/rrdcached-0
+++ b/metadata/md5-cache/acct-user/rrdcached-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rrdcached
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4aff801d80e782870e01f09a0bca66a6
diff --git a/metadata/md5-cache/acct-user/rslsync-0 b/metadata/md5-cache/acct-user/rslsync-0
index 1758b7477fdb..058493f9f1d1 100644
--- a/metadata/md5-cache/acct-user/rslsync-0
+++ b/metadata/md5-cache/acct-user/rslsync-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rslsync
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c5cfb1bcc32d46e7f6165d6663783f3f
diff --git a/metadata/md5-cache/acct-user/rspamd-0-r1 b/metadata/md5-cache/acct-user/rspamd-0-r1
index a2af7bf53920..e26ed1a1065d 100644
--- a/metadata/md5-cache/acct-user/rspamd-0-r1
+++ b/metadata/md5-cache/acct-user/rspamd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rspamd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e6ef50957d8d8ab0c8e687094f6f7eb3
diff --git a/metadata/md5-cache/acct-user/rstudio-server-0-r1 b/metadata/md5-cache/acct-user/rstudio-server-0-r1
index 27f5476d6971..ebb5d691b006 100644
--- a/metadata/md5-cache/acct-user/rstudio-server-0-r1
+++ b/metadata/md5-cache/acct-user/rstudio-server-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rstudio-server
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=44b71968a9eb18296740f7ee6c07e727
diff --git a/metadata/md5-cache/acct-user/rt-0 b/metadata/md5-cache/acct-user/rt-0
index cb5ee4789384..ba8a653e3696 100644
--- a/metadata/md5-cache/acct-user/rt-0
+++ b/metadata/md5-cache/acct-user/rt-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rt
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=28c2a261015e2303a7a6eec66acd6089
diff --git a/metadata/md5-cache/acct-user/rtkit-0-r1 b/metadata/md5-cache/acct-user/rtkit-0-r1
index be4a42f11a5d..378fd6a2636d 100644
--- a/metadata/md5-cache/acct-user/rtkit-0-r1
+++ b/metadata/md5-cache/acct-user/rtkit-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rtkit
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2572cb2a14397b36c841b0394bddf602
diff --git a/metadata/md5-cache/acct-user/rundeck-0 b/metadata/md5-cache/acct-user/rundeck-0
index 218e14149fe7..955f1fab1827 100644
--- a/metadata/md5-cache/acct-user/rundeck-0
+++ b/metadata/md5-cache/acct-user/rundeck-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rundeck
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f2e0eda740c73fa29cee27997f8526c0
diff --git a/metadata/md5-cache/acct-user/rwhoisd-0 b/metadata/md5-cache/acct-user/rwhoisd-0
index 9429bf7c9d0e..12a17fd9a804 100644
--- a/metadata/md5-cache/acct-user/rwhoisd-0
+++ b/metadata/md5-cache/acct-user/rwhoisd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/rwhoisd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=653f4cb4492e5f460053cdd970c427f6
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0-r1 b/metadata/md5-cache/acct-user/sabnzbd-0-r1
index b5d5751dab03..055b9ece1dfc 100644
--- a/metadata/md5-cache/acct-user/sabnzbd-0-r1
+++ b/metadata/md5-cache/acct-user/sabnzbd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sabnzbd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e342f7970b144b9cba099cff8e207542
diff --git a/metadata/md5-cache/acct-user/sagan-0-r1 b/metadata/md5-cache/acct-user/sagan-0-r1
index fe0c4475232b..da2ccf0942f4 100644
--- a/metadata/md5-cache/acct-user/sagan-0-r1
+++ b/metadata/md5-cache/acct-user/sagan-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sagan
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4de51a00a786a6a24f5ae2d22007088e
diff --git a/metadata/md5-cache/acct-user/samplicator-0 b/metadata/md5-cache/acct-user/samplicator-0
index 963414d282f8..042a4d2e04f5 100644
--- a/metadata/md5-cache/acct-user/samplicator-0
+++ b/metadata/md5-cache/acct-user/samplicator-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/samplicator
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dfe3fdbf42de5ada6ed2e1bda8edf16d
diff --git a/metadata/md5-cache/acct-user/sancp-0 b/metadata/md5-cache/acct-user/sancp-0
index fd71e9f4973c..b1cdad27b1ba 100644
--- a/metadata/md5-cache/acct-user/sancp-0
+++ b/metadata/md5-cache/acct-user/sancp-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sancp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=970638a3db634c912f322298668e39bc
diff --git a/metadata/md5-cache/acct-user/saned-0 b/metadata/md5-cache/acct-user/saned-0
index 09315ea5b45d..f9f77c73ca82 100644
--- a/metadata/md5-cache/acct-user/saned-0
+++ b/metadata/md5-cache/acct-user/saned-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/scanner
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=78a68ec640b34ea66ace71f5953b9667
diff --git a/metadata/md5-cache/acct-user/sanlock-0-r1 b/metadata/md5-cache/acct-user/sanlock-0-r1
index 8afd5f59d9ec..bf8a3ca26c31 100644
--- a/metadata/md5-cache/acct-user/sanlock-0-r1
+++ b/metadata/md5-cache/acct-user/sanlock-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sanlock acct-group/disk
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3f3283e030d2dc1202f03fd4a23ce820
diff --git a/metadata/md5-cache/acct-user/sauerbraten-0-r1 b/metadata/md5-cache/acct-user/sauerbraten-0-r1
index a41e1a531ce4..9d0f3cd540ef 100644
--- a/metadata/md5-cache/acct-user/sauerbraten-0-r1
+++ b/metadata/md5-cache/acct-user/sauerbraten-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sauerbraten
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=00f3a0cd9853cef7878629be0ad7fb1d
diff --git a/metadata/md5-cache/acct-user/scanlogd-0 b/metadata/md5-cache/acct-user/scanlogd-0
index 7c74ecbefbec..e4158f9a29de 100644
--- a/metadata/md5-cache/acct-user/scanlogd-0
+++ b/metadata/md5-cache/acct-user/scanlogd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/scanlogd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4c5ea2120bde6a0c4c0553f3b658c592
diff --git a/metadata/md5-cache/acct-user/scponly-0-r1 b/metadata/md5-cache/acct-user/scponly-0-r1
index 148fe981575b..cfe606c333b5 100644
--- a/metadata/md5-cache/acct-user/scponly-0-r1
+++ b/metadata/md5-cache/acct-user/scponly-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/scponly
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ae6eea3d56d04ce6076e69d3291b24d4
diff --git a/metadata/md5-cache/acct-user/sddm-0 b/metadata/md5-cache/acct-user/sddm-0
index 196d29632b3f..41738f81b503 100644
--- a/metadata/md5-cache/acct-user/sddm-0
+++ b/metadata/md5-cache/acct-user/sddm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sddm acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f6f16857e90c524116a70c1f0f79c083
diff --git a/metadata/md5-cache/acct-user/sendpage-0 b/metadata/md5-cache/acct-user/sendpage-0
index ac4b6eabcd8f..2bfd5da82139 100644
--- a/metadata/md5-cache/acct-user/sendpage-0
+++ b/metadata/md5-cache/acct-user/sendpage-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sms
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a0431af4a7386d93deef423348a3a46c
diff --git a/metadata/md5-cache/acct-user/serf-0 b/metadata/md5-cache/acct-user/serf-0
index 51a10e8fa99f..d704febe0d6b 100644
--- a/metadata/md5-cache/acct-user/serf-0
+++ b/metadata/md5-cache/acct-user/serf-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/serf
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=427927b4f8286e6611d4051064af78c4
diff --git a/metadata/md5-cache/acct-user/sguil-0 b/metadata/md5-cache/acct-user/sguil-0
index 73657fd54b8e..3c59644bbb6c 100644
--- a/metadata/md5-cache/acct-user/sguil-0
+++ b/metadata/md5-cache/acct-user/sguil-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sguil
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0eaecdeb684fb191fedf9d692518b3e1
diff --git a/metadata/md5-cache/acct-user/shellinaboxd-0-r1 b/metadata/md5-cache/acct-user/shellinaboxd-0-r1
index ea0d40a824e5..965f48d92891 100644
--- a/metadata/md5-cache/acct-user/shellinaboxd-0-r1
+++ b/metadata/md5-cache/acct-user/shellinaboxd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/shellinaboxd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=fe9366a1f688935bdccc294ffeebaf9c
diff --git a/metadata/md5-cache/acct-user/sigh-0 b/metadata/md5-cache/acct-user/sigh-0
index e286f4e2fdbe..781018b5705e 100644
--- a/metadata/md5-cache/acct-user/sigh-0
+++ b/metadata/md5-cache/acct-user/sigh-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sigh
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c9c9f0f17f5db1df61184b38ef3d581a
diff --git a/metadata/md5-cache/acct-user/sks-0 b/metadata/md5-cache/acct-user/sks-0
index 9ff8b8c4f267..7139573a0ac4 100644
--- a/metadata/md5-cache/acct-user/sks-0
+++ b/metadata/md5-cache/acct-user/sks-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sks
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=620f64bcae4bb42a2e74103ef824ff18
diff --git a/metadata/md5-cache/acct-user/slurm-0-r1 b/metadata/md5-cache/acct-user/slurm-0-r1
index bb628fd3a955..94ff49b6ae4d 100644
--- a/metadata/md5-cache/acct-user/slurm-0-r1
+++ b/metadata/md5-cache/acct-user/slurm-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/slurm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cb0584b98342918ca5a7a3c8ebce358f
diff --git a/metadata/md5-cache/acct-user/smmsp-0-r2 b/metadata/md5-cache/acct-user/smmsp-0-r2
index 62954b35927b..33a2b3defb0b 100644
--- a/metadata/md5-cache/acct-user/smmsp-0-r2
+++ b/metadata/md5-cache/acct-user/smmsp-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/smmsp
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f68a4d4897493e1ab259d155ef41423c
diff --git a/metadata/md5-cache/acct-user/smokeping-0 b/metadata/md5-cache/acct-user/smokeping-0
index 98ca9ef56b1c..ccc6dd01415a 100644
--- a/metadata/md5-cache/acct-user/smokeping-0
+++ b/metadata/md5-cache/acct-user/smokeping-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/smokeping
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=b2136a2915e896dc5ca99944ffc63a4e
diff --git a/metadata/md5-cache/acct-user/smsd-0 b/metadata/md5-cache/acct-user/smsd-0
index 040a58ffd2dc..631f654c2ee3 100644
--- a/metadata/md5-cache/acct-user/smsd-0
+++ b/metadata/md5-cache/acct-user/smsd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sms
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4c34cd72cf5083343e757f9583dbd201
diff --git a/metadata/md5-cache/acct-user/smtpd-0-r1 b/metadata/md5-cache/acct-user/smtpd-0-r1
index 8431d0991d22..6257a9f0e419 100644
--- a/metadata/md5-cache/acct-user/smtpd-0-r1
+++ b/metadata/md5-cache/acct-user/smtpd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/smtpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=120edf4c9f64015098547ab471d5b858
diff --git a/metadata/md5-cache/acct-user/smtpq-0-r1 b/metadata/md5-cache/acct-user/smtpq-0-r1
index f497149a7372..f018b31e5c9d 100644
--- a/metadata/md5-cache/acct-user/smtpq-0-r1
+++ b/metadata/md5-cache/acct-user/smtpq-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/smtpq
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3057581131fe31493029dd09def448f6
diff --git a/metadata/md5-cache/acct-user/snapclient-0 b/metadata/md5-cache/acct-user/snapclient-0
index abda798bdf44..6be4b9b988ab 100644
--- a/metadata/md5-cache/acct-user/snapclient-0
+++ b/metadata/md5-cache/acct-user/snapclient-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/audio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eee1abc32ce85d514d7a13c6bc068b1b
diff --git a/metadata/md5-cache/acct-user/snapserver-0 b/metadata/md5-cache/acct-user/snapserver-0
index 567f956d01a4..d8799f5b1244 100644
--- a/metadata/md5-cache/acct-user/snapserver-0
+++ b/metadata/md5-cache/acct-user/snapserver-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/snapserver
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a94dd8bf6c2ebbb53c5213e8d1bcab98
diff --git a/metadata/md5-cache/acct-user/sndiod-0 b/metadata/md5-cache/acct-user/sndiod-0
index 0ac4f1bed896..6d0d2ffb2cc0 100644
--- a/metadata/md5-cache/acct-user/sndiod-0
+++ b/metadata/md5-cache/acct-user/sndiod-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/audio
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=cdea6ad5c8f374598d232ebd7bfbedce
diff --git a/metadata/md5-cache/acct-user/sniproxy-0 b/metadata/md5-cache/acct-user/sniproxy-0
index a09b1935da43..72e8cde215ed 100644
--- a/metadata/md5-cache/acct-user/sniproxy-0
+++ b/metadata/md5-cache/acct-user/sniproxy-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sniproxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=85ddff8dfe5293ccfd99344fcaabef8f
diff --git a/metadata/md5-cache/acct-user/snmp_exporter-0 b/metadata/md5-cache/acct-user/snmp_exporter-0
index 94c1374c6341..85a5674e665b 100644
--- a/metadata/md5-cache/acct-user/snmp_exporter-0
+++ b/metadata/md5-cache/acct-user/snmp_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/snmp_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eb263a8ff5ab839779619c19f0369944
diff --git a/metadata/md5-cache/acct-user/snort-0 b/metadata/md5-cache/acct-user/snort-0
index e1edf1c1a8c6..788777ab2bba 100644
--- a/metadata/md5-cache/acct-user/snort-0
+++ b/metadata/md5-cache/acct-user/snort-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/snort
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d97aefb2d0049905dc15c699db72ed5b
diff --git a/metadata/md5-cache/acct-user/sobby-0 b/metadata/md5-cache/acct-user/sobby-0
index b974fb4c8601..ca0a7648ce32 100644
--- a/metadata/md5-cache/acct-user/sobby-0
+++ b/metadata/md5-cache/acct-user/sobby-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sobby
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f5eda0193b5f1ca4c52e5ef69e47db8a
diff --git a/metadata/md5-cache/acct-user/sobexsrv-0 b/metadata/md5-cache/acct-user/sobexsrv-0
index 1c099f4da520..d896ec7064ae 100644
--- a/metadata/md5-cache/acct-user/sobexsrv-0
+++ b/metadata/md5-cache/acct-user/sobexsrv-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sobexsrv
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=db829fbc208956411c949c4cfbe6a35c
diff --git a/metadata/md5-cache/acct-user/sockd-0-r1 b/metadata/md5-cache/acct-user/sockd-0-r1
index 9a08b16efb8d..6fa3cc075268 100644
--- a/metadata/md5-cache/acct-user/sockd-0-r1
+++ b/metadata/md5-cache/acct-user/sockd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sockd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5e2216f11df2d0db950e39a6b891aac2
diff --git a/metadata/md5-cache/acct-user/sogo-0-r1 b/metadata/md5-cache/acct-user/sogo-0-r1
index a4dd20b24cda..7dfa6ae03613 100644
--- a/metadata/md5-cache/acct-user/sogo-0-r1
+++ b/metadata/md5-cache/acct-user/sogo-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sogo
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=751896dcfdcdc50895e0d1c5f38ec714
diff --git a/metadata/md5-cache/acct-user/spamd-0-r1 b/metadata/md5-cache/acct-user/spamd-0-r1
index 974ff9cfde3e..f007a35905f7 100644
--- a/metadata/md5-cache/acct-user/spamd-0-r1
+++ b/metadata/md5-cache/acct-user/spamd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/spamd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6761450ff125fe6126b1e09cac528d9e
diff --git a/metadata/md5-cache/acct-user/spectrum-0-r1 b/metadata/md5-cache/acct-user/spectrum-0-r1
index 7ec0c4d4c8b2..fcc40851dc01 100644
--- a/metadata/md5-cache/acct-user/spectrum-0-r1
+++ b/metadata/md5-cache/acct-user/spectrum-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/spectrum
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3cff1b3e4282819fdee5cafe43ca41e8
diff --git a/metadata/md5-cache/acct-user/spire-0-r1 b/metadata/md5-cache/acct-user/spire-0-r1
index 8417fe1fc9f7..086b4bd5cf49 100644
--- a/metadata/md5-cache/acct-user/spire-0-r1
+++ b/metadata/md5-cache/acct-user/spire-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/spire
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0e122a5a840f0733fdb30ec5a3690b60
diff --git a/metadata/md5-cache/acct-user/spread-0 b/metadata/md5-cache/acct-user/spread-0
index b86a119255b1..f1ebeb038009 100644
--- a/metadata/md5-cache/acct-user/spread-0
+++ b/metadata/md5-cache/acct-user/spread-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/spread
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=be50511c7e8d750c5665e2492353926b
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0-r1 b/metadata/md5-cache/acct-user/sqlgrey-0-r1
index 5e27a32fd581..ebd0b2c25a3b 100644
--- a/metadata/md5-cache/acct-user/sqlgrey-0-r1
+++ b/metadata/md5-cache/acct-user/sqlgrey-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sqlgrey
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=16b30b0ccaa09372cc17389a7d8ce47f
diff --git a/metadata/md5-cache/acct-user/squid-0-r1 b/metadata/md5-cache/acct-user/squid-0-r1
index 3bc7c8815d8b..0eb46bbd61ea 100644
--- a/metadata/md5-cache/acct-user/squid-0-r1
+++ b/metadata/md5-cache/acct-user/squid-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/squid
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a4c915cdf7ca96c4c14527bffee0ca76
diff --git a/metadata/md5-cache/acct-user/sshd-0-r1 b/metadata/md5-cache/acct-user/sshd-0-r1
index 3fa4c68f1437..3b6d04930a0d 100644
--- a/metadata/md5-cache/acct-user/sshd-0-r1
+++ b/metadata/md5-cache/acct-user/sshd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sshd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c0e562c32c3c8bdc95c2071812b7eba3
diff --git a/metadata/md5-cache/acct-user/sstpc-0 b/metadata/md5-cache/acct-user/sstpc-0
index 0cdb51ceac13..263cd47e8812 100644
--- a/metadata/md5-cache/acct-user/sstpc-0
+++ b/metadata/md5-cache/acct-user/sstpc-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/sstpc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=26ff0ba081be564856d064bb5a5dac30
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-1 b/metadata/md5-cache/acct-user/stdiscosrv-1
index bf71b0493bce..c482bac4bfcd 100644
--- a/metadata/md5-cache/acct-user/stdiscosrv-1
+++ b/metadata/md5-cache/acct-user/stdiscosrv-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9e7aea011b2fcf38ede0de57d684f1dd
diff --git a/metadata/md5-cache/acct-user/steamcmd-0-r1 b/metadata/md5-cache/acct-user/steamcmd-0-r1
index 5c1ee3221d35..ed3c6d68323e 100644
--- a/metadata/md5-cache/acct-user/steamcmd-0-r1
+++ b/metadata/md5-cache/acct-user/steamcmd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/steamcmd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=57c0b8da54f870ff2731178daf13e01c
diff --git a/metadata/md5-cache/acct-user/stg-0 b/metadata/md5-cache/acct-user/stg-0
index f2854460b4bf..2d691a45e9f7 100644
--- a/metadata/md5-cache/acct-user/stg-0
+++ b/metadata/md5-cache/acct-user/stg-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/stg
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5e938c6a32d35c1f2777fd9d68e2e8e5
diff --git a/metadata/md5-cache/acct-user/strelaysrv-1 b/metadata/md5-cache/acct-user/strelaysrv-1
index 85c6f6b6e18b..bff862a6dadb 100644
--- a/metadata/md5-cache/acct-user/strelaysrv-1
+++ b/metadata/md5-cache/acct-user/strelaysrv-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=5141e1ca02bbba20cb85b545797a786b
diff --git a/metadata/md5-cache/acct-user/stubby-0-r1 b/metadata/md5-cache/acct-user/stubby-0-r1
index ba134ed6efed..55597abbcbaa 100644
--- a/metadata/md5-cache/acct-user/stubby-0-r1
+++ b/metadata/md5-cache/acct-user/stubby-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/stubby
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dad9418c5f8786f7742f67a99b33e494
diff --git a/metadata/md5-cache/acct-user/stunnel-0-r1 b/metadata/md5-cache/acct-user/stunnel-0-r1
index ec7c3cd136bf..d898d90665cf 100644
--- a/metadata/md5-cache/acct-user/stunnel-0-r1
+++ b/metadata/md5-cache/acct-user/stunnel-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/stunnel
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=24e7df9ea1fb81de6677531a02dc3563
diff --git a/metadata/md5-cache/acct-user/subsonic-0-r1 b/metadata/md5-cache/acct-user/subsonic-0-r1
index f9fd7326e9a0..ef0ca4bc18b8 100644
--- a/metadata/md5-cache/acct-user/subsonic-0-r1
+++ b/metadata/md5-cache/acct-user/subsonic-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/subsonic
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=947146c0ecdde24e07b429af11d5f154
diff --git a/metadata/md5-cache/acct-user/suricata-0-r1 b/metadata/md5-cache/acct-user/suricata-0-r1
index 7f936cfd9f82..7dfb5c7904ec 100644
--- a/metadata/md5-cache/acct-user/suricata-0-r1
+++ b/metadata/md5-cache/acct-user/suricata-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/suricata
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=359e3b1d4fc42e4b54487427b2e77377
diff --git a/metadata/md5-cache/acct-user/svn-0-r1 b/metadata/md5-cache/acct-user/svn-0-r1
index fb0a518d9d50..96f3a4eecba9 100644
--- a/metadata/md5-cache/acct-user/svn-0-r1
+++ b/metadata/md5-cache/acct-user/svn-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/svnusers
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f09baed9f08f4094a310864690522bc
diff --git a/metadata/md5-cache/acct-user/svxlink-0 b/metadata/md5-cache/acct-user/svxlink-0
index 9d2557c2a395..3d90ecab950a 100644
--- a/metadata/md5-cache/acct-user/svxlink-0
+++ b/metadata/md5-cache/acct-user/svxlink-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/svxlink
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2541aaead3ea95a43a6ac9a09d31b355
diff --git a/metadata/md5-cache/acct-user/swift-0-r1 b/metadata/md5-cache/acct-user/swift-0-r1
index 0fd647d2435d..934065be7d08 100644
--- a/metadata/md5-cache/acct-user/swift-0-r1
+++ b/metadata/md5-cache/acct-user/swift-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/swift
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=eefcf5a89122294a34b43f0e3588f15e
diff --git a/metadata/md5-cache/acct-user/synapse-0 b/metadata/md5-cache/acct-user/synapse-0
new file mode 100644
index 000000000000..3c36c1d82e5d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/synapse-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-im/synapse
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
+RDEPEND=acct-group/synapse
+SLOT=0
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=22766846034cf8f07928848c59804ac8
diff --git a/metadata/md5-cache/acct-user/syncthing-0-r1 b/metadata/md5-cache/acct-user/syncthing-0-r1
index fde70ad5e57b..4bfd92209f35 100644
--- a/metadata/md5-cache/acct-user/syncthing-0-r1
+++ b/metadata/md5-cache/acct-user/syncthing-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8634d50ddbdeb3d40edff2e46bb7b46b
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0-r1 b/metadata/md5-cache/acct-user/systemd-coredump-0-r1
index 10c977c0a1a2..9f90e7543b8b 100644
--- a/metadata/md5-cache/acct-user/systemd-coredump-0-r1
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-coredump
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ff599e74e065a62323cb614ef7c46e62
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1 b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
index d924397a169a..19ea0b6d256e 100644
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-journal-remote
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2139455feae4d85cdc0875d45b2faf48
diff --git a/metadata/md5-cache/acct-user/systemd-network-0-r1 b/metadata/md5-cache/acct-user/systemd-network-0-r1
index c4878d7b1979..4c24726e2772 100644
--- a/metadata/md5-cache/acct-user/systemd-network-0-r1
+++ b/metadata/md5-cache/acct-user/systemd-network-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-network
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=35aa7c0223abe3242fba2e1a3d6e163f
diff --git a/metadata/md5-cache/acct-user/systemd-oom-0 b/metadata/md5-cache/acct-user/systemd-oom-0
index ad9608a4ba50..30d3ec6cf500 100644
--- a/metadata/md5-cache/acct-user/systemd-oom-0
+++ b/metadata/md5-cache/acct-user/systemd-oom-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-oom
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=828e9d908c0b690438ddf7a91d15eeb8
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0-r1 b/metadata/md5-cache/acct-user/systemd-resolve-0-r1
index 7215c1be5b9d..b57f6fb4f905 100644
--- a/metadata/md5-cache/acct-user/systemd-resolve-0-r1
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-resolve
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d4c6e591bedc130720420e0359894980
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0-r1 b/metadata/md5-cache/acct-user/systemd-timesync-0-r1
index 6c36356dc151..a8db64e579ae 100644
--- a/metadata/md5-cache/acct-user/systemd-timesync-0-r1
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/systemd-timesync
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=675b0a6372a26f893ff19b558798b183
diff --git a/metadata/md5-cache/acct-user/taskd-0 b/metadata/md5-cache/acct-user/taskd-0
index 17fbeac1e86f..1f69570c4fe3 100644
--- a/metadata/md5-cache/acct-user/taskd-0
+++ b/metadata/md5-cache/acct-user/taskd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/taskd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1d2e8518c73330103820b072845422be
diff --git a/metadata/md5-cache/acct-user/teamspeak-0-r1 b/metadata/md5-cache/acct-user/teamspeak-0-r1
index ff79c421ce27..3c1c25f360a6 100644
--- a/metadata/md5-cache/acct-user/teamspeak-0-r1
+++ b/metadata/md5-cache/acct-user/teamspeak-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/teamspeak
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=30f3154ba85ed7a24924349205d9b5d6
diff --git a/metadata/md5-cache/acct-user/telegraf-0-r1 b/metadata/md5-cache/acct-user/telegraf-0-r1
index c9c8b603cd2c..16a22777b1fa 100644
--- a/metadata/md5-cache/acct-user/telegraf-0-r1
+++ b/metadata/md5-cache/acct-user/telegraf-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/telegraf
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ca11caddf344e5bf7ed334f2c28deea2
diff --git a/metadata/md5-cache/acct-user/tenshi-0 b/metadata/md5-cache/acct-user/tenshi-0
index 8bdcc6e63396..953401823767 100644
--- a/metadata/md5-cache/acct-user/tenshi-0
+++ b/metadata/md5-cache/acct-user/tenshi-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tenshi
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f1f7ed3a0468567bb598926b45d5af6e
diff --git a/metadata/md5-cache/acct-user/thttpd-0 b/metadata/md5-cache/acct-user/thttpd-0
index 1ccc2dc021c2..db6e858894cf 100644
--- a/metadata/md5-cache/acct-user/thttpd-0
+++ b/metadata/md5-cache/acct-user/thttpd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/thttpd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9c500ca5a145e084bac10369aeb83b26
diff --git a/metadata/md5-cache/acct-user/timidity-0 b/metadata/md5-cache/acct-user/timidity-0
index 9559c71647b9..c6abfa5bd216 100644
--- a/metadata/md5-cache/acct-user/timidity-0
+++ b/metadata/md5-cache/acct-user/timidity-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nobody
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc5b0fb040e298e0fb31721f23f9d59f
diff --git a/metadata/md5-cache/acct-user/tinydns-0 b/metadata/md5-cache/acct-user/tinydns-0
index 78190bbb4180..b0e61f992afc 100644
--- a/metadata/md5-cache/acct-user/tinydns-0
+++ b/metadata/md5-cache/acct-user/tinydns-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=6e22480e1629f7e0397ff6077070b8b3
diff --git a/metadata/md5-cache/acct-user/tinyproxy-0 b/metadata/md5-cache/acct-user/tinyproxy-0
index 1fd925f076ff..fa729be6b0f4 100644
--- a/metadata/md5-cache/acct-user/tinyproxy-0
+++ b/metadata/md5-cache/acct-user/tinyproxy-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tinyproxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=f8a278d8d65befb0bdd747828e73181a
diff --git a/metadata/md5-cache/acct-user/tomcat-0 b/metadata/md5-cache/acct-user/tomcat-0
index 688b81dcf989..e43858bcd4a1 100644
--- a/metadata/md5-cache/acct-user/tomcat-0
+++ b/metadata/md5-cache/acct-user/tomcat-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tomcat
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3da2a4090298f42182774d22aea7b669
diff --git a/metadata/md5-cache/acct-user/tor-0-r1 b/metadata/md5-cache/acct-user/tor-0-r1
index ceaaaeb61de0..0b9957f752d3 100644
--- a/metadata/md5-cache/acct-user/tor-0-r1
+++ b/metadata/md5-cache/acct-user/tor-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tor
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=874803105392accc58cdf0dc0e5fef9f
diff --git a/metadata/md5-cache/acct-user/tox-0-r1 b/metadata/md5-cache/acct-user/tox-0-r1
index 909e154d1399..695b1c0c2b63 100644
--- a/metadata/md5-cache/acct-user/tox-0-r1
+++ b/metadata/md5-cache/acct-user/tox-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tox
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d119a7fc2dbf482047d67275d5a6b119
diff --git a/metadata/md5-cache/acct-user/tpm-0 b/metadata/md5-cache/acct-user/tpm-0
index b9a88c820316..03f762215cd1 100644
--- a/metadata/md5-cache/acct-user/tpm-0
+++ b/metadata/md5-cache/acct-user/tpm-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tpm
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e9be42621a97dac873fd3dc17730210a
diff --git a/metadata/md5-cache/acct-user/transmission-1-r1 b/metadata/md5-cache/acct-user/transmission-1-r1
index 30572b3eceb8..e68205ec207f 100644
--- a/metadata/md5-cache/acct-user/transmission-1-r1
+++ b/metadata/md5-cache/acct-user/transmission-1-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/transmission
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=9f6537f41d1a6d8e6ce5eed2b3900c21
diff --git a/metadata/md5-cache/acct-user/trickster-0 b/metadata/md5-cache/acct-user/trickster-0
index 03788694d085..59b3b0da6e94 100644
--- a/metadata/md5-cache/acct-user/trickster-0
+++ b/metadata/md5-cache/acct-user/trickster-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/trickster
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=66e34fa9cec2b5e6560f5714c0a10b14
diff --git a/metadata/md5-cache/acct-user/trojan-0 b/metadata/md5-cache/acct-user/trojan-0
index b96c0d22d35a..3b05827b83ca 100644
--- a/metadata/md5-cache/acct-user/trojan-0
+++ b/metadata/md5-cache/acct-user/trojan-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/trojan
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=66569f052664a362c1e721776e81158a
diff --git a/metadata/md5-cache/acct-user/tss-0-r1 b/metadata/md5-cache/acct-user/tss-0-r1
index 14531597f3b8..9f381cd0d3cb 100644
--- a/metadata/md5-cache/acct-user/tss-0-r1
+++ b/metadata/md5-cache/acct-user/tss-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/tss
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1c306a517ff5660f2ee14e8b43aba2d6
diff --git a/metadata/md5-cache/acct-user/ttrssd-0 b/metadata/md5-cache/acct-user/ttrssd-0
index 0a9f41391050..0dbcc2fa3ee6 100644
--- a/metadata/md5-cache/acct-user/ttrssd-0
+++ b/metadata/md5-cache/acct-user/ttrssd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ttrssd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e56ddbd6aa76e344a381b1080934e987
diff --git a/metadata/md5-cache/acct-user/turnserver-0-r1 b/metadata/md5-cache/acct-user/turnserver-0-r1
index dc85ee19e0bf..fd667b952f2c 100644
--- a/metadata/md5-cache/acct-user/turnserver-0-r1
+++ b/metadata/md5-cache/acct-user/turnserver-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/turnserver
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4013a7a3d0ccb561a03e9f7792891b50
diff --git a/metadata/md5-cache/acct-user/tvheadend-0-r1 b/metadata/md5-cache/acct-user/tvheadend-0-r1
index bb0ca4d7509d..109c792fc935 100644
--- a/metadata/md5-cache/acct-user/tvheadend-0-r1
+++ b/metadata/md5-cache/acct-user/tvheadend-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ccc406bad5028a0904cdf1f4f17031af
diff --git a/metadata/md5-cache/acct-user/ulogd-0 b/metadata/md5-cache/acct-user/ulogd-0
index f05b8169a4f7..5c4284ad9354 100644
--- a/metadata/md5-cache/acct-user/ulogd-0
+++ b/metadata/md5-cache/acct-user/ulogd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ulogd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=3cad380b56f4afece28f72f9d6b80137
diff --git a/metadata/md5-cache/acct-user/ultimaker-0-r1 b/metadata/md5-cache/acct-user/ultimaker-0-r1
index f0ede56c6079..dc60aba40972 100644
--- a/metadata/md5-cache/acct-user/ultimaker-0-r1
+++ b/metadata/md5-cache/acct-user/ultimaker-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ultimaker
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=ffa93dc5bcb5d4062066bfaca928a80a
diff --git a/metadata/md5-cache/acct-user/unbound-0-r1 b/metadata/md5-cache/acct-user/unbound-0-r1
index 5b0c7c82e983..e4f154447f5e 100644
--- a/metadata/md5-cache/acct-user/unbound-0-r1
+++ b/metadata/md5-cache/acct-user/unbound-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/unbound
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d63b390deeb7da3d5a9b59159b9366d7
diff --git a/metadata/md5-cache/acct-user/unbound-telemetry-1 b/metadata/md5-cache/acct-user/unbound-telemetry-1
index 1729a26c9dcc..eae0d0a1b34f 100644
--- a/metadata/md5-cache/acct-user/unbound-telemetry-1
+++ b/metadata/md5-cache/acct-user/unbound-telemetry-1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/unbound-telemetry acct-group/unbound
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d753bdd3aabf6d287588a3a5fb3147c0
diff --git a/metadata/md5-cache/acct-user/unifi-0-r1 b/metadata/md5-cache/acct-user/unifi-0-r1
index f4cf1d278804..e556fafe11b5 100644
--- a/metadata/md5-cache/acct-user/unifi-0-r1
+++ b/metadata/md5-cache/acct-user/unifi-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/unifi
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=52f42a2745d48a8e50c9cd8ed96a1cd9
diff --git a/metadata/md5-cache/acct-user/unifi-video-0 b/metadata/md5-cache/acct-user/unifi-video-0
index 2658bf337c07..4fd04d8962e9 100644
--- a/metadata/md5-cache/acct-user/unifi-video-0
+++ b/metadata/md5-cache/acct-user/unifi-video-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/unifi-video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=58908b81961a3de83c7534bf5297a26e
diff --git a/metadata/md5-cache/acct-user/unrealircd-0-r1 b/metadata/md5-cache/acct-user/unrealircd-0-r1
index 30c0dc8e0d24..aaee56353ec8 100644
--- a/metadata/md5-cache/acct-user/unrealircd-0-r1
+++ b/metadata/md5-cache/acct-user/unrealircd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/unrealircd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=0669f5ed12b3aa06e4cd27618f2a5af4
diff --git a/metadata/md5-cache/acct-user/upmpdcli-0 b/metadata/md5-cache/acct-user/upmpdcli-0
index de3026a3917e..bd7ba15c632d 100644
--- a/metadata/md5-cache/acct-user/upmpdcli-0
+++ b/metadata/md5-cache/acct-user/upmpdcli-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/upmpdcli
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=e562ef7ddc0b50ebe55452aeeeae95d9
diff --git a/metadata/md5-cache/acct-user/uptimed-0-r2 b/metadata/md5-cache/acct-user/uptimed-0-r2
index 96f53ff80862..485c6195d6c0 100644
--- a/metadata/md5-cache/acct-user/uptimed-0-r2
+++ b/metadata/md5-cache/acct-user/uptimed-0-r2
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/uptimed
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=13cb97901ad8e72e774c0297ea096614
diff --git a/metadata/md5-cache/acct-user/usbmux-0-r1 b/metadata/md5-cache/acct-user/usbmux-0-r1
index 2bb14f41ad36..2b9d75d04c31 100644
--- a/metadata/md5-cache/acct-user/usbmux-0-r1
+++ b/metadata/md5-cache/acct-user/usbmux-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/usb acct-group/plugdev
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=1c3258ad673bb8f6303fc6f1e9014891
diff --git a/metadata/md5-cache/acct-user/ushare-0 b/metadata/md5-cache/acct-user/ushare-0
index 29a4923581e2..c081989d910d 100644
--- a/metadata/md5-cache/acct-user/ushare-0
+++ b/metadata/md5-cache/acct-user/ushare-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ushare
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bb579492038eb6d399120fed664fdeac
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0 b/metadata/md5-cache/acct-user/uwsgi_exporter-0
index 45eaef2b4118..8231dac1ebaa 100644
--- a/metadata/md5-cache/acct-user/uwsgi_exporter-0
+++ b/metadata/md5-cache/acct-user/uwsgi_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/uwsgi_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=bce237357cc3aea7b4e44bfbdb78fc67
diff --git a/metadata/md5-cache/acct-user/vacation-0 b/metadata/md5-cache/acct-user/vacation-0
index e6e7700c8ff6..1e429e7f47b4 100644
--- a/metadata/md5-cache/acct-user/vacation-0
+++ b/metadata/md5-cache/acct-user/vacation-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vacation
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=93d1164c3c05d824a1e108903f829977
diff --git a/metadata/md5-cache/acct-user/varnish-0-r1 b/metadata/md5-cache/acct-user/varnish-0-r1
index c368233943e0..1d08e4fc4700 100644
--- a/metadata/md5-cache/acct-user/varnish-0-r1
+++ b/metadata/md5-cache/acct-user/varnish-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/varnish
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=05fb013295a49761d6a3aaeff7e2c6a2
diff --git a/metadata/md5-cache/acct-user/vault-0-r1 b/metadata/md5-cache/acct-user/vault-0-r1
index f046c844c80b..d432b4a0deb3 100644
--- a/metadata/md5-cache/acct-user/vault-0-r1
+++ b/metadata/md5-cache/acct-user/vault-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vault
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=2bdea5cbe607857e5b214dd095c630bc
diff --git a/metadata/md5-cache/acct-user/vault_exporter-0 b/metadata/md5-cache/acct-user/vault_exporter-0
index 755fb1da23eb..1775098cdb52 100644
--- a/metadata/md5-cache/acct-user/vault_exporter-0
+++ b/metadata/md5-cache/acct-user/vault_exporter-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vault_exporter
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=79ada0a6e124706fee0f4f6bba09eb9a
diff --git a/metadata/md5-cache/acct-user/vboxguest-0-r1 b/metadata/md5-cache/acct-user/vboxguest-0-r1
index a1f472b1502e..ae57d6444b66 100644
--- a/metadata/md5-cache/acct-user/vboxguest-0-r1
+++ b/metadata/md5-cache/acct-user/vboxguest-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vboxguest
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=8d69f31321109c602783715929a10708
diff --git a/metadata/md5-cache/acct-user/vdr-0-r1 b/metadata/md5-cache/acct-user/vdr-0-r1
index 994d3c203ae8..e41418afad95 100644
--- a/metadata/md5-cache/acct-user/vdr-0-r1
+++ b/metadata/md5-cache/acct-user/vdr-0-r1
@@ -6,5 +6,5 @@ IUSE=graphlcd legacy-homedir remote serial systemd
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vdr acct-group/audio acct-group/cdrom acct-group/video
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c478d32f07c2efcd5f2784ab9f88b0bc
diff --git a/metadata/md5-cache/acct-user/vdradmin-0-r1 b/metadata/md5-cache/acct-user/vdradmin-0-r1
index 84e83a37ea21..1c90b716b25c 100644
--- a/metadata/md5-cache/acct-user/vdradmin-0-r1
+++ b/metadata/md5-cache/acct-user/vdradmin-0-r1
@@ -6,5 +6,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vdradmin acct-group/vdradmin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=004499dde41951d348d8001223830421
diff --git a/metadata/md5-cache/acct-user/vnstat-0 b/metadata/md5-cache/acct-user/vnstat-0
index 620eb79c09b8..0ca5f53c7a06 100644
--- a/metadata/md5-cache/acct-user/vnstat-0
+++ b/metadata/md5-cache/acct-user/vnstat-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vnstat
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=4b60d79f793713ae54e494fc90987c4b
diff --git a/metadata/md5-cache/acct-user/vpopmail-0-r1 b/metadata/md5-cache/acct-user/vpopmail-0-r1
index 48e08c73709c..84003d42c763 100644
--- a/metadata/md5-cache/acct-user/vpopmail-0-r1
+++ b/metadata/md5-cache/acct-user/vpopmail-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/vpopmail
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=74dc93285157ae710df15422176a657f
diff --git a/metadata/md5-cache/acct-user/wesnoth-0-r1 b/metadata/md5-cache/acct-user/wesnoth-0-r1
index 89208fafc87e..012edc6426e3 100644
--- a/metadata/md5-cache/acct-user/wesnoth-0-r1
+++ b/metadata/md5-cache/acct-user/wesnoth-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/wesnoth
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=dc7474e38fed68604dd6e2b4cd0c88b8
diff --git a/metadata/md5-cache/acct-user/wwwoffle-0 b/metadata/md5-cache/acct-user/wwwoffle-0
index 7d1e835b7afc..2e185ddbd28c 100644
--- a/metadata/md5-cache/acct-user/wwwoffle-0
+++ b/metadata/md5-cache/acct-user/wwwoffle-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/wwwoffle
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=45638756d1cd1930678802c45e229e67
diff --git a/metadata/md5-cache/acct-user/x2goprint-0-r1 b/metadata/md5-cache/acct-user/x2goprint-0-r1
index 44f976907a5c..3d849e9ac47b 100644
--- a/metadata/md5-cache/acct-user/x2goprint-0-r1
+++ b/metadata/md5-cache/acct-user/x2goprint-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/x2goprint
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=46919a59e339a99732b698bd46596e85
diff --git a/metadata/md5-cache/acct-user/x2gouser-0-r1 b/metadata/md5-cache/acct-user/x2gouser-0-r1
index 2250146d3119..df5913a5f7eb 100644
--- a/metadata/md5-cache/acct-user/x2gouser-0-r1
+++ b/metadata/md5-cache/acct-user/x2gouser-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/x2gouser
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=80ea0942cf5200396c8fb5924c67b95c
diff --git a/metadata/md5-cache/acct-user/xrootd-0-r1 b/metadata/md5-cache/acct-user/xrootd-0-r1
index a4c7390f1815..4d1d24cca6dc 100644
--- a/metadata/md5-cache/acct-user/xrootd-0-r1
+++ b/metadata/md5-cache/acct-user/xrootd-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/xrootd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c77806ad7e73aa8624cec346f44db023
diff --git a/metadata/md5-cache/acct-user/zabbix-0 b/metadata/md5-cache/acct-user/zabbix-0
index ef2aa438fef6..b298ee6ce4e9 100644
--- a/metadata/md5-cache/acct-user/zabbix-0
+++ b/metadata/md5-cache/acct-user/zabbix-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/zabbix
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=267e3d4f50e7c0889b5a3dbc7887c0d4
diff --git a/metadata/md5-cache/acct-user/zeppelin-0-r1 b/metadata/md5-cache/acct-user/zeppelin-0-r1
index 7cc234989ada..070dcb1647ee 100644
--- a/metadata/md5-cache/acct-user/zeppelin-0-r1
+++ b/metadata/md5-cache/acct-user/zeppelin-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/zeppelin
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=475964f0f96b999b434a22b94bdc9f9f
diff --git a/metadata/md5-cache/acct-user/zetcd-0 b/metadata/md5-cache/acct-user/zetcd-0
index e809bad8728e..ada32a0a3ae1 100644
--- a/metadata/md5-cache/acct-user/zetcd-0
+++ b/metadata/md5-cache/acct-user/zetcd-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/zetcd
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=110d58422e4b9e9fb66d1030ccd55f02
diff --git a/metadata/md5-cache/acct-user/ziproxy-0 b/metadata/md5-cache/acct-user/ziproxy-0
index 78c65e2432de..c2c4d6725500 100644
--- a/metadata/md5-cache/acct-user/ziproxy-0
+++ b/metadata/md5-cache/acct-user/ziproxy-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/ziproxy
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=a9eb5ded26a2797ecba61be37d1fbc09
diff --git a/metadata/md5-cache/acct-user/znc-0-r1 b/metadata/md5-cache/acct-user/znc-0-r1
index 9a94d97ae08a..e9473b0e609d 100644
--- a/metadata/md5-cache/acct-user/znc-0-r1
+++ b/metadata/md5-cache/acct-user/znc-0-r1
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/znc
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=c38432bb2a7740a6809d1346fe6394c9
diff --git a/metadata/md5-cache/acct-user/zookeeper-0 b/metadata/md5-cache/acct-user/zookeeper-0
index d19cfdea7336..bb3dced776f2 100644
--- a/metadata/md5-cache/acct-user/zookeeper-0
+++ b/metadata/md5-cache/acct-user/zookeeper-0
@@ -5,5 +5,5 @@ INHERIT=acct-user
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong 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
 RDEPEND=acct-group/zookeeper
 SLOT=0
-_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	e13a0387c7e9b60485839e4695fa071c	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=d91769cfaee8038ce2d08c149769633c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b77d4da088a4..67b8aaeb00fc 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.12-r1 b/metadata/md5-cache/app-admin/awscli-1.25.12-r1
deleted file mode 100644
index 6bb2b0ab7e91..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.12.tar.gz -> aws-cli-1.25.12.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3e9bea6751f29667f4e645e0d0fa1458
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.17-r1 b/metadata/md5-cache/app-admin/awscli-1.25.17-r1
index 8d1cf261ec1c..6d7b89d375f6 100644
--- a/metadata/md5-cache/app-admin/awscli-1.25.17-r1
+++ b/metadata/md5-cache/app-admin/awscli-1.25.17-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
 INHERIT=bash-completion-r1 distutils-r1 multiprocessing
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.17.tar.gz -> aws-cli-1.25.17.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
+_md5_=3e9bea6751f29667f4e645e0d0fa1458
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.20 b/metadata/md5-cache/app-admin/awscli-1.25.20
deleted file mode 100644
index df311c001f61..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.20
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.20.tar.gz -> aws-cli-1.25.20.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.21 b/metadata/md5-cache/app-admin/awscli-1.25.21
deleted file mode 100644
index ede2915e7741..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.21.tar.gz -> aws-cli-1.25.21.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.23 b/metadata/md5-cache/app-admin/awscli-1.25.23
deleted file mode 100644
index 71e40119901f..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.23.tar.gz -> aws-cli-1.25.23.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.25 b/metadata/md5-cache/app-admin/awscli-1.25.25
deleted file mode 100644
index 9e23f2f1a85e..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.25.tar.gz -> aws-cli-1.25.25.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.24 b/metadata/md5-cache/app-admin/awscli-1.25.26
similarity index 93%
rename from metadata/md5-cache/app-admin/awscli-1.25.24
rename to metadata/md5-cache/app-admin/awscli-1.25.26
index 028eb5f9d46d..636c8259ecde 100644
--- a/metadata/md5-cache/app-admin/awscli-1.25.24
+++ b/metadata/md5-cache/app-admin/awscli-1.25.26
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 distutils-r1 multiprocessing
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=>=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws/aws-cli/archive/1.25.24.tar.gz -> aws-cli-1.25.24.gh.tar.gz
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.26.tar.gz -> aws-cli-1.25.26.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/doctl-1.78.0 b/metadata/md5-cache/app-admin/doctl-1.78.0
new file mode 100644
index 000000000000..8dd084b26e08
--- /dev/null
+++ b/metadata/md5-cache/app-admin/doctl-1.78.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A command line tool for DigitalOcean services
+EAPI=8
+HOMEPAGE=https://github.com/digitalocean/doctl
+INHERIT=bash-completion-r1 edo go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/digitalocean/doctl/archive/v1.78.0.tar.gz -> doctl-1.78.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=47a110a5e543c71cb9aaf19a076e09fc
diff --git a/metadata/md5-cache/app-admin/fluentd-1.14.4 b/metadata/md5-cache/app-admin/fluentd-1.14.4
index 73d5cfbe83df..810c9940bfda 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.14.4
+++ b/metadata/md5-cache/app-admin/fluentd-1.14.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6b5a6dd25ff5b38cd203acecf6354e6b
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.5 b/metadata/md5-cache/app-admin/mcollective-2.12.5
index b85af50a5945..fb6b6d0a7d10 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.5
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.5.tar.gz -> mcollective-2.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b53984e7d27a37d90bba036d49352629
diff --git a/metadata/md5-cache/app-admin/needrestart-3.3 b/metadata/md5-cache/app-admin/needrestart-3.3
deleted file mode 100644
index 6119e3f714da..000000000000
--- a/metadata/md5-cache/app-admin/needrestart-3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.3.tar.gz -> needrestart-3.3.tar.gz
-_md5_=347da772ae31f9ccd63018ce18ecc5a6
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r1 b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
index f7c506fd3cf6..2ba6ed6c021f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.22-r1
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d07c205871037987c092e998b820c4ec
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r2 b/metadata/md5-cache/app-admin/puppet-5.5.22-r2
index 4c5db9be924f..77753b746f8f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.22-r2
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=002777aef21d1f6df8ee547411eeca84
diff --git a/metadata/md5-cache/app-admin/puppet-7.16.0 b/metadata/md5-cache/app-admin/puppet-7.16.0
index ccaf9d6bc580..bcc2e57b6354 100644
--- a/metadata/md5-cache/app-admin/puppet-7.16.0
+++ b/metadata/md5-cache/app-admin/puppet-7.16.0
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=af112911e65ff3bc7cda4c98ff40d609
diff --git a/metadata/md5-cache/app-admin/puppet-7.17.0 b/metadata/md5-cache/app-admin/puppet-7.17.0
index 564b798df549..01170c87beac 100644
--- a/metadata/md5-cache/app-admin/puppet-7.17.0
+++ b/metadata/md5-cache/app-admin/puppet-7.17.0
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=af112911e65ff3bc7cda4c98ff40d609
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.5.1 b/metadata/md5-cache/app-admin/puppet-lint-2.5.1
index 788715cbf0ad..76ad317c18dc 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.5.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=353f451413d8358b28f745a8801aee9a
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.5.2 b/metadata/md5-cache/app-admin/puppet-lint-2.5.2
index c276a1743858..5a3d1fbb2c1a 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.5.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d478cc0ae53489ac200a3fbee5bae83a
diff --git a/metadata/md5-cache/app-admin/pwgen-2.08-r1 b/metadata/md5-cache/app-admin/pwgen-2.08-r1
new file mode 100644
index 000000000000..92bc4540577b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pwgen-2.08-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Password Generator
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/pwgen/
+IUSE=livecd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/pwgen/pwgen-2.08.tar.gz
+_md5_=95a4aada4d7f926236c62ed2df362f2f
diff --git a/metadata/md5-cache/app-admin/r10k-3.15.0 b/metadata/md5-cache/app-admin/r10k-3.15.0
index bbd9da6ebc36..e97842166199 100644
--- a/metadata/md5-cache/app-admin/r10k-3.15.0
+++ b/metadata/md5-cache/app-admin/r10k-3.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/r10k-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5a9d6e9d1f37e07d634561ea41a41ab1
diff --git a/metadata/md5-cache/app-admin/r10k-3.7.0-r2 b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
index eb61f742aa19..6c0df5a07b27 100644
--- a/metadata/md5-cache/app-admin/r10k-3.7.0-r2
+++ b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/r10k-3.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=28d282c583357a835e9da1bb55a6134f
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 2b7aa89ee78f..3d30732c871f 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/unace-2.5-r5 b/metadata/md5-cache/app-arch/unace-2.5-r6
similarity index 91%
rename from metadata/md5-cache/app-arch/unace-2.5-r5
rename to metadata/md5-cache/app-arch/unace-2.5-r6
index c9f23c9273d0..267de6c4263e 100644
--- a/metadata/md5-cache/app-arch/unace-2.5-r5
+++ b/metadata/md5-cache/app-arch/unace-2.5-r6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=ACE unarchiver
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.winace.com/
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
@@ -8,4 +8,4 @@ LICENSE=freedist
 SLOT=1
 SRC_URI=mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5-9.debian.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6344c1ebea53b490a72542a581286c98
+_md5_=32387e68a7b21e8eeabc9e500a688b08
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12-r1 b/metadata/md5-cache/app-arch/unadf-0.7.12-r1
deleted file mode 100644
index 545c6c7d5500..000000000000
--- a/metadata/md5-cache/app-arch/unadf-0.7.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Extract files from Amiga adf disk images
-EAPI=6
-HOMEPAGE=http://lclevy.free.fr/adflib/
-INHERIT=autotools
-IUSE=static-libs
-KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21f6b67ace0e0bdac02a2dcec29ff3f3
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12-r2 b/metadata/md5-cache/app-arch/unadf-0.7.12-r2
new file mode 100644
index 000000000000..00adf54214a4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unadf-0.7.12-r2
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Extract files from Amiga adf disk images
+EAPI=8
+HOMEPAGE=http://lclevy.free.fr/adflib/
+INHERIT=autotools
+KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1971e3fa2348e81e0a5f10b9345a5623
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15 b/metadata/md5-cache/app-arch/zpaq-7.15
deleted file mode 100644
index 4150e578315d..000000000000
--- a/metadata/md5-cache/app-arch/zpaq-7.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=app-arch/unzip dev-lang/perl
-DESCRIPTION=Journaling incremental deduplicating archiving compressor
-EAPI=6
-HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
-INHERIT=flag-o-matic pax-utils toolchain-funcs
-IUSE=debug +jit
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fc6ac2a45b5c344b488fad5876ad3c9
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15-r1 b/metadata/md5-cache/app-arch/zpaq-7.15-r1
new file mode 100644
index 000000000000..7173a640c150
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zpaq-7.15-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip dev-lang/perl
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=Journaling incremental deduplicating archiving compressor
+EAPI=8
+HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
+INHERIT=flag-o-matic pax-utils toolchain-funcs
+IUSE=debug +jit
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Unlicense
+SLOT=0
+SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d84f85299f177fe204dc0471fbada244
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 3e7c76c6062f..a360a428107f 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0 b/metadata/md5-cache/app-crypt/age-1.0.0
index 87620ac79b28..303ad84dcbb6 100644
--- a/metadata/md5-cache/app-crypt/age-1.0.0
+++ b/metadata/md5-cache/app-crypt/age-1.0.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
 EAPI=7
 HOMEPAGE=https://github.com/FiloSottile/age
-KEYWORDS=~amd64
+INHERIT=go-module
+KEYWORDS=amd64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/FiloSottile/age/archive/v1.0.0.tar.gz -> age-1.0.0.tar.gz mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-rc.1.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-rc.1.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=43ba97f0e533278d8ced8634b8991149
+_md5_=7ef4f97b7bbcd2fb8fdae613584f1e33
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.35 b/metadata/md5-cache/app-crypt/pgpdump-0.35
new file mode 100644
index 000000000000..73260dd745a7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.35
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/bzip2 sys-libs/zlib
+DESCRIPTION=A PGP packet visualizer
+EAPI=8
+HOMEPAGE=https://www.mew.org/~kazu/proj/pgpdump/
+KEYWORDS=~amd64 ~arm64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib
+SLOT=0
+SRC_URI=https://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.35.tar.gz
+_md5_=3f6b3731cdfd1b6ce7562c17ed8c93a2
diff --git a/metadata/md5-cache/app-crypt/signify-31 b/metadata/md5-cache/app-crypt/signify-31
index 4315e860adb3..ab04a50a643d 100644
--- a/metadata/md5-cache/app-crypt/signify-31
+++ b/metadata/md5-cache/app-crypt/signify-31
@@ -12,4 +12,4 @@ RDEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
 SLOT=0
 SRC_URI=https://github.com/aperezdc/signify/releases/download/v31/signify-31.tar.xz verify-sig? ( https://github.com/aperezdc/signify/releases/download/v31/SHA256.sig -> signify-31.sha.sig )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=41f8389f34e22ffb3a698dcc460eced6
+_md5_=669d5eb2373d986a1b636f61c0aee1a6
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index b9ffc78aba0b..962357eff2e5 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 7f7bd9937c4a..465c1299ea2f 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://prime-dict.osdn.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5bb0c79b712311c8117b619480e9f3f2
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 12a0c8377f93..0ca5eda2208c 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.7 b/metadata/md5-cache/app-editors/diakonos-0.9.7
index ec693d5c681b..ec52719910df 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.7
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pistos/diakonos/archive/refs/tags/v0.9.7.tar.gz -> diakonos-0.9.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cb55b05085e7b69c8e9a7312faac8756
diff --git a/metadata/md5-cache/app-editors/mousepad-0.5.10 b/metadata/md5-cache/app-editors/mousepad-0.5.10
new file mode 100644
index 000000000000..85ba037834e2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mousepad-0.5.10
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
+DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
+EAPI=8
+HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
+INHERIT=gnome2-utils xdg-utils
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.10.tar.bz2
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9316946b5c9dd5d225de96651e697796
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0c2647018fea..0cc1a0184cfd 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/corfu-0.26 b/metadata/md5-cache/app-emacs/corfu-0.26
new file mode 100644
index 000000000000..7900ae7c6725
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/corfu-0.26
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-27:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Completion Overlay Region FUnction
+EAPI=8
+HOMEPAGE=https://github.com/minad/corfu
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-27:*
+SLOT=0
+SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.26.tar.gz -> corfu-0.26.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=696d4a3283d8b7451a1c7a0820dc74be
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
similarity index 64%
rename from metadata/md5-cache/app-emacs/emacs-daemon-0.22
rename to metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
index 5cb8da8fe8ae..e18eba773104 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
@@ -1,12 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Gentoo support for Emacs running as a server in the background
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=36c20df2524113c0324415ec525e6cd3
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=d64f21bf6a17b8176178a408eda184bf
diff --git a/metadata/md5-cache/app-emacs/emacs-eix-0.0.0 b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
new file mode 100644
index 000000000000..c52ad3a48a66
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Eix integration for GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-eix.git
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.3:*
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/emacs-eix.git/snapshot/emacs-eix-0.0.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=0177cf7c7f69f795e16afd0e0c33bf69
diff --git a/metadata/md5-cache/app-emacs/emacs-eix-9999 b/metadata/md5-cache/app-emacs/emacs-eix-9999
new file mode 100644
index 000000000000..b8ac829fb8b5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-eix-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.3:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Eix integration for GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-eix.git
+INHERIT=elisp git-r3
+LICENSE=GPL-2+
+PROPERTIES=live
+RDEPEND=>=app-editors/emacs-24.3:*
+SLOT=0
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_md5_=0177cf7c7f69f795e16afd0e0c33bf69
diff --git a/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0 b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
new file mode 100644
index 000000000000..f8e6f9aad7e5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=OpenRC integration for GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-openrc.git
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.3:*
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/emacs-openrc.git/snapshot/emacs-openrc-0.0.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=0960f83dc2236ec843ff8c01ba7cad5a
diff --git a/metadata/md5-cache/app-emacs/emacs-openrc-9999 b/metadata/md5-cache/app-emacs/emacs-openrc-9999
new file mode 100644
index 000000000000..4ea68efd4c3a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-openrc-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.3:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=OpenRC integration for GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-openrc.git
+INHERIT=elisp git-r3
+LICENSE=GPL-2+
+PROPERTIES=live
+RDEPEND=>=app-editors/emacs-24.3:*
+SLOT=0
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_md5_=0960f83dc2236ec843ff8c01ba7cad5a
diff --git a/metadata/md5-cache/app-emacs/vertico-0.23 b/metadata/md5-cache/app-emacs/vertico-0.25
similarity index 82%
rename from metadata/md5-cache/app-emacs/vertico-0.23
rename to metadata/md5-cache/app-emacs/vertico-0.25
index 9b77679cfbf1..fe93a82dfedd 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.23
+++ b/metadata/md5-cache/app-emacs/vertico-0.25
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.23.tar.gz -> vertico-0.23.tar.gz
+SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.25.tar.gz -> vertico-0.25.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
 _md5_=a21f11f2d111ef98b890cc7961a8bb1a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index db48d2c022ff..de96f0525549 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
index fe9234cf6693..26b8a3cc38db 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.18.tar.gz -> vagrant-2.2.18.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=35b717780739c536654603f54a6fa1c6
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.19 b/metadata/md5-cache/app-emulation/vagrant-2.2.19
index 324344fe878e..bf39815071b7 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.19
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.19
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.19.tar.gz -> vagrant-2.2.19.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b3dfcfd5c39d63448a8287d98791fd4
diff --git a/metadata/md5-cache/app-emulation/xen-4.15.3 b/metadata/md5-cache/app-emulation/xen-4.15.3
index 49faee8e1934..c55589870cfa 100644
--- a/metadata/md5-cache/app-emulation/xen-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-4.15.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xenproject.org
 INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
 IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.15.3
 REQUIRED_USE=arm? ( debug )
@@ -13,4 +13,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=305825fa43b435a77479fbec9fc0328a
+_md5_=3e29fe1d9bddf026428dc88f61d2dbce
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.3 b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
index 494695385629..35d1dabb5eb0 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://xenproject.org
 INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4251f3e116653fab30335f73b20862a3
+_md5_=c78add70cb483f09dd532dba06d330f9
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 98b9125a699c..c62d5ce389f3 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-12 b/metadata/md5-cache/app-eselect/eselect-repository-12
index 9e60c86c576c..25ec59dbae04 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-12
+++ b/metadata/md5-cache/app-eselect/eselect-repository-12
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 INHERIT=python-single-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-admin/eselect python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v12.tar.gz -> eselect-repository-12.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=030f1bb789a83e7d718f379fc9f6aa7c
+_md5_=e2f39ecde937183a24f29673fffa7c3b
diff --git a/metadata/md5-cache/app-eselect/eselect-timidity-20110513 b/metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
similarity index 86%
rename from metadata/md5-cache/app-eselect/eselect-timidity-20110513
rename to metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
index fea585d358a1..f941ffbcc940 100644
--- a/metadata/md5-cache/app-eselect/eselect-timidity-20110513
+++ b/metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of TiMidity++ patchsets
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=b27e45a501891ea929f683be48f2f2a0
+_md5_=3b3e48f691a7e49376944bfa41c8eb2a
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 59b9e65eebda..ce2abd4cd5de 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.8 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.8
deleted file mode 100644
index 49a113847388..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=M17N engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-INHERIT=gnome2-utils xdg
-IUSE=gtk nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.8/ibus-m17n-1.4.8.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c36017fe723c618c168c05e680461e97
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.9 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.9
index cc1daddede34..a462163ea239 100644
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.9
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 INHERIT=gnome2-utils xdg
 IUSE=gtk nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.9/ibus-m17n-1.4.9.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=772e47982c0d8562dc9ae48d2d5b0c69
+_md5_=23309a21e808fd8b314ab6f7206a04ca
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
index 33c00738b8d9..a99c12d7c929 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 INHERIT=gnome2-utils python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.16.0/ibus-typing-booster-2.16.0.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=00e7e2ac0d8312474428fb542606f864
+_md5_=3e9bba7901abc599de829d0d0b3dc9c2
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.15.25 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.17.0
similarity index 96%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.15.25
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.17.0
index d77a3bf28b1a..9a4ce996edef 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.15.25
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.17.0
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 INHERIT=gnome2-utils python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.15.25/ibus-typing-booster-2.15.25.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.17.0/ibus-typing-booster-2.17.0.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3e9bba7901abc599de829d0d0b3dc9c2
+_md5_=00e7e2ac0d8312474428fb542606f864
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 92f3e6a3d8ce..5aaecc752dae 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/ckb-0.5.0 b/metadata/md5-cache/app-misc/ckb-0.5.0
new file mode 100644
index 000000000000..5935a02bf3b8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckb-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-sound/pulseaudio media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
+DESCRIPTION=Corsair K65/K70/K95 Driver
+EAPI=8
+HOMEPAGE=https://github.com/ckb-next/ckb-next
+INHERIT=cmake udev xdg
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-sound/pulseaudio media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
+SLOT=0
+SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.5.0.tar.gz -> ckb-0.5.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c612a89463127f524efd3873114d4a28
diff --git a/metadata/md5-cache/app-misc/ckb-9999 b/metadata/md5-cache/app-misc/ckb-9999
new file mode 100644
index 000000000000..239516d4d76b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckb-9999
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-sound/pulseaudio media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
+DESCRIPTION=Corsair K65/K70/K95 Driver
+EAPI=8
+HOMEPAGE=https://github.com/ckb-next/ckb-next
+INHERIT=cmake udev xdg git-r3
+IUSE=systemd
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-sound/pulseaudio media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
+SLOT=0
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c612a89463127f524efd3873114d4a28
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.18 b/metadata/md5-cache/app-misc/colordiff-1.0.18
deleted file mode 100644
index f900f15c0725..000000000000
--- a/metadata/md5-cache/app-misc/colordiff-1.0.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Colorizes output of diff
-EAPI=6
-HOMEPAGE=https://www.colordiff.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-apps/diffutils
-SLOT=0
-SRC_URI=https://www.colordiff.org/colordiff-1.0.18.tar.gz
-_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
-_md5_=e472e3e132ed5505ac4b4aa43a9a1dff
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.20 b/metadata/md5-cache/app-misc/hivex-1.3.20
index ef104e03de2f..219332fb1397 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.20
+++ b/metadata/md5-cache/app-misc/hivex-1.3.20
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.20.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6995d17032440d7dbc8bddf9bd09950e
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.21 b/metadata/md5-cache/app-misc/hivex-1.3.21
index 932a66dc498c..9d94b14e8b5c 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.21
+++ b/metadata/md5-cache/app-misc/hivex-1.3.21
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.21.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9541ede15efbceed06ca8ac614c564b7
diff --git a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1 b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
index 5ab223f660fa..52f0dd1c4aae 100644
--- a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+++ b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Simple information system script
 EAPI=7
 HOMEPAGE=https://github.com/dylanaraps/neofetch
 INHERIT=optfeature prefix
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/7.1.0/neofetch-7.1.0.tar.gz
 _eclasses_=optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7
-_md5_=74e7e6d85153a8644790da53f11a51d4
+_md5_=b3d95024afb81833360c59d79ca4e8f3
diff --git a/metadata/md5-cache/app-misc/rbutil-1.5.1 b/metadata/md5-cache/app-misc/rbutil-1.5.1
index 4d3defe5f1f3..e1929224d9ca 100644
--- a/metadata/md5-cache/app-misc/rbutil-1.5.1
+++ b/metadata/md5-cache/app-misc/rbutil-1.5.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= >=dev-libs/quazip-1.2:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/speex media-libs/speexdsp virtual/libusb:1
+DEPEND=app-arch/bzip2:= >=dev-libs/quazip-1.2:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/speex media-libs/speexdsp virtual/libusb:1 dev-qt/qttest:5
 DESCRIPTION=Rockbox open source firmware manager for music players
 EAPI=8
 HOMEPAGE=https://www.rockbox.org/wiki/RockboxUtility
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:= >=dev-libs/quazip-1.2:= dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
 SRC_URI=https://download.rockbox.org/rbutil/source/RockboxUtility-v1.5.1-src.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6998b1c8902a63353410ad5de6807f64
+_md5_=6b468cd27604205f3acc5fb54b20d001
diff --git a/metadata/md5-cache/app-misc/scrub-2.6.1-r1 b/metadata/md5-cache/app-misc/scrub-2.6.1-r1
new file mode 100644
index 000000000000..2d62fcd1d284
--- /dev/null
+++ b/metadata/md5-cache/app-misc/scrub-2.6.1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Overwrite files with iterative patterns
+EAPI=8
+HOMEPAGE=https://github.com/chaos/scrub
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/chaos/scrub/releases/download/2.6.1/scrub-2.6.1.tar.gz
+_md5_=6a1688fbe758a426b4dd8357ebf1c8c4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a273402c44b9..9352417c4663 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/impressive-0.13.1 b/metadata/md5-cache/app-office/impressive-0.13.1
new file mode 100644
index 000000000000..7f51c5edb68f
--- /dev/null
+++ b/metadata/md5-cache/app-office/impressive-0.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Stylish way of giving presentations with Python
+EAPI=8
+HOMEPAGE=http://impressive.sourceforge.net/
+INHERIT=optfeature python-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-text/mupdf dev-python/pygame[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-apps/xrandr || ( media-fonts/dejavu media-fonts/corefonts )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/impressive/Impressive/0.13.1/Impressive-0.13.1.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=828c68ebc9d3f248f60316eaeb58b97a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 595e27fcc6da..a25d3961ec7c 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.3-r1 b/metadata/md5-cache/app-portage/repoman-3.0.3-r2
similarity index 66%
rename from metadata/md5-cache/app-portage/repoman-3.0.3-r1
rename to metadata/md5-cache/app-portage/repoman-3.0.3-r2
index 3da689f25960..d9a175a374a1 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.3-r1
+++ b/metadata/md5-cache/app-portage/repoman-3.0.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+)] )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <sys-apps/portage-3.0.31[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
@@ -8,9 +8,9 @@ INHERIT=distutils-r1
 IUSE=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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+)] )
+RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <sys-apps/portage-3.0.31[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.3.tar.bz2 https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> repoman-3.0.3-unit-test-bug-779055.patch https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> repoman-3.0.3-version-bug-779508.patch https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> repoman-3.0.3-unit-test-bug-779967.patch
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=711ffa917086143dec2a97fe1a33c433
+_md5_=e7c927d34ee938257eee13fb5db63536
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
deleted file mode 100644
index 776f420af34a..000000000000
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-INHERIT=distutils-r1 git-r3
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=7844e6bdcb2ea516658e92b55ba9df01
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 14c6e6206355..7bd78b156cf5 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
index 4d167c6bdaad..6afe91458b68 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
 EAPI=8
 HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-zsh-completions/archive/20220112.tar.gz -> gentoo-zsh-completions-20220112.tar.gz
-_md5_=a1ebb05206ea217441714615d63f4e4c
+_md5_=1327c3e230609d9c7bb56fa6d1fb8eef
diff --git a/metadata/md5-cache/app-shells/push-2.0-r1 b/metadata/md5-cache/app-shells/push-2.0-r1
deleted file mode 100644
index 7f99bfa1c91c..000000000000
--- a/metadata/md5-cache/app-shells/push-2.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
-EAPI=6
-HOMEPAGE=https://github.com/vaeth/push/
-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 ~x86-solaris
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/vaeth/push/archive/v2.0.tar.gz -> push-2.0.tar.gz
-_md5_=907072c9ef7fe500ed6df61318f995bc
diff --git a/metadata/md5-cache/app-shells/tcsh-6.24.00 b/metadata/md5-cache/app-shells/tcsh-6.24.00
index 4ffce654aa1d..447193762d4a 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.24.00
+++ b/metadata/md5-cache/app-shells/tcsh-6.24.00
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.tcsh.org/
 INHERIT=flag-o-matic autotools prefix
 IUSE=nls doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libcrypt:= virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.24.00.tar.gz ftp://ftp.astron.com/pub/tcsh/old/tcsh-6.24.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6c12c383e3396ee4ad9f1d6059f81482
+_md5_=b2036b8dffb34ebdf8c46b28d1128a4b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8deccf83f7fb..d36eccb61f22 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index 7f8ef9c7ce09..99049a6f5637 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/58
 SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=916979dccf380b5e8ee6aaf044a0eb36
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1 b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
index db309cf6b687..09349d45d05d 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=674e71f5d31b366857fe94fe62681378
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.11 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.11
index e7ddb1384ff1..54f1209c975f 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.11
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cdebbecfa2ef90b82521054a73590dcd
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.13 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.13
index 062c0d079083..aa9e85626737 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.13
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.13
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cbde43d24bfb15bc4878687bbe072bb4
diff --git a/metadata/md5-cache/app-text/poppler-22.07.0 b/metadata/md5-cache/app-text/poppler-22.07.0
new file mode 100644
index 000000000000..595682aebc64
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-22.07.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-aacid ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) boost? ( dev-libs/boost )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=8
+HOMEPAGE=https://poppler.freedesktop.org/
+INHERIT=cmake toolchain-funcs xdg-utils verify-sig
+IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/122
+SRC_URI=https://poppler.freedesktop.org/poppler-22.07.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.07.0.tar.xz.sig )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e90d2e0c2f29bbbcc4b91d4042fb2019
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 83a387f5b69d..73f1d0fa498a 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -12,4 +12,4 @@ RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( d
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef13b23d7ed5fe33e77d61d56d58bdb7
+_md5_=e90d2e0c2f29bbbcc4b91d4042fb2019
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r4 b/metadata/md5-cache/app-text/ronn-0.7.3-r4
index c370ec77fe49..930e6edbd3d1 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=233f5916ff605288afb558b43b1147c7
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1 b/metadata/md5-cache/app-text/ronn-ng-0.9.1
index 4dc867d79dd9..d75b91043a4d 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71c113894fae9dc690fec32a82905fdc
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
index 037ae36fbeb8..e0368a48610a 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3c3ae57c3ca7646cc168f8ad5b6061e2
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
index c8ccb0b4e204..9e884c8fa756 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a61c28378eb73a056e84faf80e7fb132
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
deleted file mode 100644
index 17528644f107..000000000000
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Type 1 Font utilities
-EAPI=6
-HOMEPAGE=http://www.lcdf.org/type/#t1utils
-INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=!<media-libs/freetype-1.4_pre20080316
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e28e30ad4cecb7b681c8b1947ae6e85f
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r2
similarity index 63%
rename from metadata/md5-cache/app-text/wdiff-1.2.2-r1
rename to metadata/md5-cache/app-text/wdiff-1.2.2-r2
index 885b91c66dc0..2eb00249d8bf 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r2
@@ -1,13 +1,14 @@
+BDEPEND=sys-apps/texinfo test? ( app-misc/screen )
 DEFINED_PHASES=configure test
-DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0= sys-apps/texinfo test? ( app-misc/screen )
+DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:=
 DESCRIPTION=Create a diff disregarding formatting
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/wdiff/
 IUSE=experimental test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
+RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=bfcc8f8315333079e01577427976eac5
+_md5_=f0b285807e6a2f8a267c64e27d09168c
diff --git a/metadata/md5-cache/app-text/webgen-1.7.2 b/metadata/md5-cache/app-text/webgen-1.7.2
index 5b92d6bfebea..33a06fe054e0 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fa9ca4a8d5024df7eb8254a04f1986ae
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.20 b/metadata/md5-cache/app-text/xapian-omega-1.4.20
new file mode 100644
index 000000000000..9e1859763441
--- /dev/null
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=~dev-libs/xapian-1.4.20:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
+EAPI=8
+HOMEPAGE=https://xapian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-libs/xapian-1.4.20:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+SLOT=0
+SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.20/xapian-omega-1.4.20.tar.xz
+_md5_=26949e44d3dcffd2ef9c96eaa59248c7
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 4c58412046e5..ed504ffe0de5 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.3-r1 b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
index 36108c20b62b..a3e8ce7019b4 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3-r1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=31081c81d39e742467c4372c3739ca6d
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6c86fbf17f35..eaa866ef4b14 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/folly-2022.07.04.00 b/metadata/md5-cache/dev-cpp/folly-2022.07.04.00
new file mode 100644
index 000000000000..3a5d3698f216
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/folly-2022.07.04.00
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-libs/boost:=[context,threads(+)] dev-libs/double-conversion:= dev-libs/libaio dev-libs/libevent:= dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= sys-libs/liburing:= sys-libs/zlib llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/binutils-libs
+DESCRIPTION=An open-source C++ library developed and used at Facebook
+EAPI=8
+HOMEPAGE=https://github.com/facebook/folly
+INHERIT=cmake toolchain-funcs
+IUSE=llvm-libunwind test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-libs/boost:=[context,threads(+)] dev-libs/double-conversion:= dev-libs/libaio dev-libs/libevent:= dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= sys-libs/liburing:= sys-libs/zlib llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= )
+RESTRICT=!test? ( test )
+SLOT=0/2022.07.04.00
+SRC_URI=https://github.com/facebook/folly/releases/download/v2022.07.04.00/folly-v2022.07.04.00.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ba3f524ee5a1157633f3a85b19f49406
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index dd3cba7218c3..494baf46d628 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r3 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r3
index c51d36670527..5dedcf19ab55 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r3
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=488c93741f6d3fd5a265bb70ecaaed14
diff --git a/metadata/md5-cache/dev-db/redis-5.0.14 b/metadata/md5-cache/dev-db/redis-5.0.14
deleted file mode 100644
index 132baf7fcd9f..000000000000
--- a/metadata/md5-cache/dev-db/redis-5.0.14
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) test? ( dev-lang/tcl:0= )
-DESCRIPTION=A persistent caching system, key-value and data structures database
-EAPI=7
-HOMEPAGE=https://redis.io
-INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
-IUSE=+jemalloc tcmalloc luajit selinux test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
-REQUIRED_USE=?? ( tcmalloc jemalloc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.redis.io/releases/redis-5.0.14.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a32d738e5badf695fd08fa465d1d7bf4
diff --git a/metadata/md5-cache/dev-db/redis-7.0.1-r1 b/metadata/md5-cache/dev-db/redis-7.0.1-r1
index d1aaf72ac674..c46279918a5e 100644
--- a/metadata/md5-cache/dev-db/redis-7.0.1-r1
+++ b/metadata/md5-cache/dev-db/redis-7.0.1-r1
@@ -5,13 +5,13 @@ DESCRIPTION=A persistent caching system, key-value, and data structures database
 EAPI=8
 HOMEPAGE=https://redis.io
 INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
-IUSE=+jemalloc ssl systemd tcmalloc test
+IUSE=+jemalloc selinux ssl systemd tcmalloc test
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
-RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
+RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-7.0.1.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c2e2503f0fcf66846e60763201d47b30
+_md5_=4ee1397b1b2ba8a4df2edbad73ae57f2
diff --git a/metadata/md5-cache/dev-db/redis-7.0.2 b/metadata/md5-cache/dev-db/redis-7.0.2
index 294213359546..6562fcca3594 100644
--- a/metadata/md5-cache/dev-db/redis-7.0.2
+++ b/metadata/md5-cache/dev-db/redis-7.0.2
@@ -5,13 +5,13 @@ DESCRIPTION=A persistent caching system, key-value, and data structures database
 EAPI=8
 HOMEPAGE=https://redis.io
 INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
-IUSE=+jemalloc ssl systemd tcmalloc test
+IUSE=+jemalloc selinux ssl systemd tcmalloc test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
-RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
+RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-7.0.2.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6aa2182b313410bea576bf066e99d527
+_md5_=eefc315784655ef9a9b5a20ee4efc8d4
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 7ed3cecc1e3c..8bf757e8fb85 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/avrdude-7.0 b/metadata/md5-cache/dev-embedded/avrdude-7.0
new file mode 100644
index 000000000000..274145f72861
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/avrdude-7.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/hidapi virtual/libelf:= virtual/libusb:0 virtual/libusb:1 ftdi? ( dev-embedded/libftdi:1= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=AVR Downloader/UploaDEr
+EAPI=8
+HOMEPAGE=https://avrdudes.github.io/avrdude https://github.com/avrdudes/avrdude
+INHERIT=cmake
+IUSE=ftdi readline
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/hidapi virtual/libelf:= virtual/libusb:0 virtual/libusb:1 ftdi? ( dev-embedded/libftdi:1= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/avrdudes/avrdude/archive/refs/tags/v7.0.tar.gz -> avrdude-7.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3b32a6830c39eb7fa84b3a603421fa40
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0708784dbf7e..f330e68ec15f 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/bcmail-1.69-r1 b/metadata/md5-cache/dev-java/bcmail-1.69-r1
deleted file mode 100644
index d4a491c98597..000000000000
--- a/metadata/md5-cache/dev-java/bcmail-1.69-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 dev-java/jakarta-activation:1 dev-java/javax-mail:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 dev-java/jakarta-activation:1 dev-java/javax-mail:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=8da5d2d5d95e1f5c896a299d22e38e3f
diff --git a/metadata/md5-cache/dev-java/bcmail-1.71 b/metadata/md5-cache/dev-java/bcmail-1.71
index 9dac509af6c7..3eca5c81e9c9 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.71
+++ b/metadata/md5-cache/dev-java/bcmail-1.71
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=~dev-java/bcpkix-1.71:0 ~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 dev-java/jakarta-activation:1 dev-java/javax-mail:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=9d9632eed0bfcbbaaf73b552c438bf5e
+_md5_=f45f68d9d771a8fd344f530c8751b8b0
diff --git a/metadata/md5-cache/dev-java/bcpg-1.69 b/metadata/md5-cache/dev-java/bcpg-1.69
deleted file mode 100644
index 700eb21a9d47..000000000000
--- a/metadata/md5-cache/dev-java/bcpg-1.69
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/bcprov-1.69:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java cryptography APIs
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=c586bb96bc1c8ffda729116f4cd8c46c
diff --git a/metadata/md5-cache/dev-java/bcpg-1.71 b/metadata/md5-cache/dev-java/bcpg-1.71
index 6c1bd3f97b1b..5cec8ce4fc82 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.71
+++ b/metadata/md5-cache/dev-java/bcpg-1.71
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=d018454c84edde8e41f9d808d884854b
+_md5_=5bab4044d4ae71914e0eae78c749a318
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.69 b/metadata/md5-cache/dev-java/bcpkix-1.69
deleted file mode 100644
index 72e2c88aa681..000000000000
--- a/metadata/md5-cache/dev-java/bcpkix-1.69
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare pretend setup test
-DEPEND=~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-INHERIT=java-pkg-2 java-pkg-simple check-reqs
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=816bf43cb03d381035ea210f0abc3dc9
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.71-r1 b/metadata/md5-cache/dev-java/bcpkix-1.71-r1
index 543849c5a1b0..66407fcfde35 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.71-r1
+++ b/metadata/md5-cache/dev-java/bcpkix-1.71-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=36f1a315719ed1b90cb976c3dfbc0859
+_md5_=1e74fd040246a97cb43256f3ba362240
diff --git a/metadata/md5-cache/dev-java/bcprov-1.69 b/metadata/md5-cache/dev-java/bcprov-1.69
deleted file mode 100644
index b7cfc40feef6..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.69
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=compile install preinst prepare pretend setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java cryptography APIs
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-INHERIT=java-pkg-2 java-pkg-simple check-reqs
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-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://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=814c5034775a00b7c6f98aa6733bebf7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.71-r1 b/metadata/md5-cache/dev-java/bcprov-1.71-r1
index 521afc5cbe4b..0cd5ec7e7c6f 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.71-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.71-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple check-reqs
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 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://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=ec6595df5931aa99499e8c136f85f1ef
+_md5_=484cdaab4066451757bb48883980f6bf
diff --git a/metadata/md5-cache/dev-java/bcutil-1.69 b/metadata/md5-cache/dev-java/bcutil-1.69
deleted file mode 100644
index cac1fe86f624..000000000000
--- a/metadata/md5-cache/dev-java/bcutil-1.69
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/bcprov-1.69:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=1daceb77b59371772b191b981754b0e0
diff --git a/metadata/md5-cache/dev-java/bcutil-1.71 b/metadata/md5-cache/dev-java/bcutil-1.71
index 904aa7679cbc..dcab21d4005e 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.71
+++ b/metadata/md5-cache/dev-java/bcutil-1.71
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.bouncycastle.org/java.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=~dev-java/bcprov-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=735e8d4a04b4a2d21f788eb4d8b3e10a
+_md5_=9eebf8874434cb2c54ae974f6dfab04b
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.0 b/metadata/md5-cache/dev-java/javassist-3.29.0
index 551ee8895f2e..bee7458de2e8 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.0
+++ b/metadata/md5-cache/dev-java/javassist-3.29.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=!test? ( >=virtual/jdk-8:* ) test? ( >=virtual/jdk-11:* dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=A class library for editing bytecodes in Java.
 EAPI=8
 HOMEPAGE=https://www.javassist.org
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_0_ga.tar.gz -> javassist-3.29.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=0058c87b3941400eb61107ef74204d51
+_md5_=afbd10920cc36fd57835e2859c7915b8
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.9 b/metadata/md5-cache/dev-java/jffi-1.3.9
index 4ab5397fecf6..8343e634ca72 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.9
+++ b/metadata/md5-cache/dev-java/jffi-1.3.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jffi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~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=1.3
 SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.9.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=51bd90026ce6cc02c069e89048d735d9
+_md5_=9668f98af87d6142a87455d9c610f1d6
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
index 382cc1aa53de..c7002b0e0f1f 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-ffi
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=65e8ea25c578a8b69d08047be20faedc
+_md5_=5b5a01198ce49fa0a3eda5dae6eea813
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
deleted file mode 100644
index 58eba4e42585..000000000000
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/asm:9 dev-java/asm-analysis:9 dev-java/asm-commons:9 dev-java/asm-tree:9 dev-java/asm-util:9 >=dev-java/jffi-1.3.6:1.2 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A library for invoking native functions from java
-EAPI=7
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/asm:9 dev-java/asm-analysis:9 dev-java/asm-commons:9 dev-java/asm-tree:9 dev-java/asm-util:9 >=dev-java/jffi-1.3.6:1.2 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/jffi-1.3.6:1.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz -> jnr-ffi-2.2.8-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=ffc9c7e67b1fc3d4bf0e7654a4e5c84d
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
index abd72a5aea7e..72a80ee05c38 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-netdb
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=93758635a29a6302a789ef0e938fd919
+_md5_=6866ce853d617c0f1c65a28c332f1a33
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.15 b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
index 9546a0ee0ee3..3f0b920a0a66 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.1.15
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jnr/jnr-posix
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=EPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=d38b3c44c96e1b21f381c5e4ff9fedcd
+_md5_=2f9726c1606901841c2c13705827a5eb
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
index ffaaa3e5993b..9932b0fb3bdf 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.22/src/apache-tomcat-10.0.22-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_md5_=6b43feb8238b38fd4dd1b4500f7fdbe5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
index a83c3a0f86bb..a79f077bd124 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_md5_=640e0f90af98f0d9f9c2a18e3273c0ed
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
index 4957181767d5..b30d916474ed 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.64/src/apache-tomcat-9.0.64-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_md5_=dc6c6a917a6e9b15c4d2047a0b2c0808
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
deleted file mode 100644
index 04e5c3c9f854..000000000000
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=An XML Entity and URI Resolver
-EAPI=7
-HOMEPAGE=http://xml.apache.org/commons/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=d4a018806605ca5d4b9a4ad82307e754
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
index b47612685747..435a874109b5 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://xerces.apache.org/xml-commons/components/resolver/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8
-_md5_=d158a01e877e1e75992f37fbf2a3ccdd
+_md5_=62cf7cdb0ea6134a378cdae8184a8d35
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a37a08da792e..09643aedcce4 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/erlang-23.3.4.12 b/metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1
similarity index 100%
rename from metadata/md5-cache/dev-lang/erlang-23.3.4.12
rename to metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1
diff --git a/metadata/md5-cache/dev-lang/erlang-23.3.4.14-r1 b/metadata/md5-cache/dev-lang/erlang-23.3.4.15
similarity index 93%
rename from metadata/md5-cache/dev-lang/erlang-23.3.4.14-r1
rename to metadata/md5-cache/dev-lang/erlang-23.3.4.15
index 56465aed223a..d82ea0aebee3 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.3.4.14-r1
+++ b/metadata/md5-cache/dev-lang/erlang-23.3.4.15
@@ -9,7 +9,7 @@ IUSE=doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets java
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/23.3.4.14
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.3.4.14.tar.gz -> erlang-23.3.4.14.tar.gz http://erlang.org/download/otp_doc_man_23.3.tar.gz -> erlang_doc_man_23.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.3.tar.gz -> erlang_doc_html_23.3.tar.gz )
+SLOT=0/23.3.4.15
+SRC_URI=https://github.com/erlang/otp/archive/OTP-23.3.4.15.tar.gz -> erlang-23.3.4.15.tar.gz http://erlang.org/download/otp_doc_man_23.3.tar.gz -> erlang_doc_man_23.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.3.tar.gz -> erlang_doc_html_23.3.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
 _md5_=d967748078d0d8fbe0e15f021d48a769
diff --git a/metadata/md5-cache/dev-lang/erlang-24.3.3 b/metadata/md5-cache/dev-lang/erlang-24.3.3-r1
similarity index 100%
rename from metadata/md5-cache/dev-lang/erlang-24.3.3
rename to metadata/md5-cache/dev-lang/erlang-24.3.3-r1
diff --git a/metadata/md5-cache/dev-lang/erlang-24.3.4.2 b/metadata/md5-cache/dev-lang/erlang-24.3.4.2
new file mode 100644
index 000000000000..e1e6f9f9c619
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-24.3.4.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/24.3.4.2
+SRC_URI=https://github.com/erlang/otp/archive/OTP-24.3.4.2.tar.gz -> erlang-24.3.4.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-24.3/otp_doc_man_24.3.tar.gz -> erlang_doc_man_24.3.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-24.3/otp_doc_html_24.3.tar.gz -> erlang_doc_html_24.3.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_md5_=cb59cb7552719895cffae4e70e37084c
diff --git a/metadata/md5-cache/dev-lang/erlang-25.0 b/metadata/md5-cache/dev-lang/erlang-25.0-r1
similarity index 100%
rename from metadata/md5-cache/dev-lang/erlang-25.0
rename to metadata/md5-cache/dev-lang/erlang-25.0-r1
diff --git a/metadata/md5-cache/dev-lang/erlang-24.3.4 b/metadata/md5-cache/dev-lang/erlang-25.0.2
similarity index 87%
rename from metadata/md5-cache/dev-lang/erlang-24.3.4
rename to metadata/md5-cache/dev-lang/erlang-25.0.2
index 1ceda50675bc..3fb666542efe 100644
--- a/metadata/md5-cache/dev-lang/erlang-24.3.4
+++ b/metadata/md5-cache/dev-lang/erlang-25.0.2
@@ -9,7 +9,7 @@ IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/24.3.4
-SRC_URI=https://github.com/erlang/otp/archive/OTP-24.3.4.tar.gz -> erlang-24.3.4.tar.gz https://github.com/erlang/otp/releases/download/OTP-24.3/otp_doc_man_24.3.tar.gz -> erlang_doc_man_24.3.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-24.3/otp_doc_html_24.3.tar.gz -> erlang_doc_html_24.3.tar.gz )
+SLOT=0/25.0.2
+SRC_URI=https://github.com/erlang/otp/archive/OTP-25.0.2.tar.gz -> erlang-25.0.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_man_25.0.tar.gz -> erlang_doc_man_25.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_html_25.0.tar.gz -> erlang_doc_html_25.0.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
 _md5_=cb59cb7552719895cffae4e70e37084c
diff --git a/metadata/md5-cache/dev-lang/php-8.1.7 b/metadata/md5-cache/dev-lang/php-8.1.7
deleted file mode 100644
index 77617a0c8bf6..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.1.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.7.tar.xz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=bbf611f745e3d52d325b95863e9c4921
diff --git a/metadata/md5-cache/dev-lang/php-8.1.8 b/metadata/md5-cache/dev-lang/php-8.1.8
index 57c99865c59d..73c6db65ad2c 100644
--- a/metadata/md5-cache/dev-lang/php-8.1.8
+++ b/metadata/md5-cache/dev-lang/php-8.1.8
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.php.net/
 IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
 INHERIT=flag-o-matic systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.1
 SRC_URI=https://www.php.net/distributions/php-8.1.8.tar.xz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b938f24dc70cb0e6594051c32797cbc8
+_md5_=bbf611f745e3d52d325b95863e9c4921
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_beta3_p2 b/metadata/md5-cache/dev-lang/python-3.11.0_beta3_p2
new file mode 100644
index 000000000000..8cd15e06b6ea
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_beta3_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
+RESTRICT=!test? ( test )
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0b3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.11.0b3_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b3.tar.xz.asc )
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=98ecbc0b3aee10f1084df2e575ad3b83
diff --git a/metadata/md5-cache/dev-lang/swig-3.0.12 b/metadata/md5-cache/dev-lang/swig-3.0.12
deleted file mode 100644
index ba20c36b7f1f..000000000000
--- a/metadata/md5-cache/dev-lang/swig-3.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
-DESCRIPTION=Simplified Wrapper and Interface Generator
-EAPI=6
-HOMEPAGE=http://www.swig.org/
-IUSE=ccache doc pcre
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ BSD BSD-2
-RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/swig/swig-3.0.12.tar.gz
-_md5_=d7540a6e2890e75b4f47290a04ab5a21
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
index 04eafdcb58a0..583ed5573af2 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:2.7 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=ICE middleware C++ library and generator tools
 EAPI=7
 HOMEPAGE=https://zeroc.com/products/ice
@@ -8,10 +8,10 @@ INHERIT=db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
 IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby27
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:2.7 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) php? ( || ( php_targets_php7-4 ) )
 RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	db-use	867a9246a45efc09934e0f8e3380c813	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=e052c313bcd5b7135d4f878fe4d9294c
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	db-use	867a9246a45efc09934e0f8e3380c813	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dc9ed1702521157fdce3c3cf7915024d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b38687a65207..128bcc6648a2 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.0 b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
index 673aa8632f79..801e2604f454 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/ragel >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/ragel >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=High-performance regular expression matching library
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.0.tar.gz -> hyperscan-5.4.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e4406319c9871f211ef3040240a22a4
+_md5_=00a72d7cf08cda55a3bef9cb217b17ce
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
deleted file mode 100644
index e3e89b9581cd..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-INHERIT=cmake flag-o-matic
-IUSE=+l0 +vaapi
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.21.23269.tar.gz -> intel-compute-runtime-22.21.23269.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a4f8721cbcefd7ebad434ccb6f6b43b3
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
index 84ec52c0875a..ff50a41d96cb 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.0.2:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/22.22.23355.tar.gz -> intel-compute-runtime-22.22.23355.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d1ab25267c27ac0bc040ff2cb178e71
+_md5_=a4f8721cbcefd7ebad434ccb6f6b43b3
diff --git a/metadata/md5-cache/dev-libs/libcdada-0.4.0 b/metadata/md5-cache/dev-libs/libcdada-0.4.0
new file mode 100644
index 000000000000..797a637547dd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdada-0.4.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( || ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DESCRIPTION=Basic data structures in C
+EAPI=8
+HOMEPAGE=https://github.com/msune/libcdada
+INHERIT=autotools python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/msune/libcdada/archive/refs/tags/v0.4.0.tar.gz -> libcdada-0.4.0.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2b7071de733c3370b0b58ba1f10746db
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1 b/metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
index 330e37c2d82b..ac1c62d452dc 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=8
@@ -10,4 +10,4 @@ LICENSE=MIT
 SLOT=0/4.2.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.8.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=08da592cc60466c4edf5bd34d00013c4
+_md5_=90a9d994b23f11789c560fbc3e6a393e
diff --git a/metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1 b/metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
index 7157def64ce0..410837ea6223 100644
--- a/metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
+++ b/metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.04 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Fork of the json-c library, which is optimized for liblognorm processing
 EAPI=8
@@ -10,4 +10,4 @@ LICENSE=MIT
 SLOT=0/4.3.0
 SRC_URI=http://download.rsyslog.com/libfastjson/libfastjson-0.99.9.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c6285c83c4fed4fb02e08ea691f041cc
+_md5_=5761b0ce67c81e8dffe9987a28534b9f
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.6 b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
index 262fdf66c0e4..99b22f4dc589 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1.0
 SRC_URI=https://www.liblognorm.com/files/download/liblognorm-2.0.6.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8f7ed648423a05c49476c96f94af6f3c
+_md5_=aaf26c4d9749187d27672239bf88dab2
diff --git a/metadata/md5-cache/dev-libs/libmodbus-3.1.6 b/metadata/md5-cache/dev-libs/libmodbus-3.1.6
deleted file mode 100644
index 4d256b2f8430..000000000000
--- a/metadata/md5-cache/dev-libs/libmodbus-3.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=doc? ( app-text/asciidoc app-text/xmlto )
-DESCRIPTION=Modbus library which supports RTU communication over a serial line or a TCP link
-EAPI=7
-HOMEPAGE=https://libmodbus.org/
-IUSE=static-libs test doc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://libmodbus.org/releases/libmodbus-3.1.6.tar.gz
-_md5_=6450e53779537e5fded0067acf7b577f
diff --git a/metadata/md5-cache/dev-libs/libmodbus-3.1.7 b/metadata/md5-cache/dev-libs/libmodbus-3.1.7
index cb7a6042158d..3b63f0ed8322 100644
--- a/metadata/md5-cache/dev-libs/libmodbus-3.1.7
+++ b/metadata/md5-cache/dev-libs/libmodbus-3.1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Modbus library which supports RTU communication over a serial line o
 EAPI=8
 HOMEPAGE=https://libmodbus.org/
 IUSE=static-libs test doc
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libmodbus.org/releases/libmodbus-3.1.7.tar.gz
-_md5_=ca882c1cf632c43d76f55d731d651141
+_md5_=48a66b530e9f15b27cc9f45329a54bda
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.12.1 b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
new file mode 100644
index 000000000000..80f7bebb5908
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.12.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install test
+DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+DESCRIPTION=A simple, lightweight C library for writing XMPP clients
+EAPI=7
+HOMEPAGE=http://strophe.im/libstrophe/
+IUSE=doc expat gnutls
+KEYWORDS=~amd64
+LICENSE=|| ( MIT GPL-3 )
+RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+SLOT=0/0.1
+SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.12.1/libstrophe-0.12.1.tar.xz
+_md5_=9b5da6bedd71cbe5380f1438f9e84f5f
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.5 b/metadata/md5-cache/dev-libs/libtpms-0.9.5
new file mode 100644
index 000000000000..98a273daa04b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtpms-0.9.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/openssl:=
+DESCRIPTION=Library providing software emultion of a TPM
+EAPI=8
+HOMEPAGE=https://github.com/stefanberger/libtpms
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:=
+SLOT=0
+SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.5.tar.gz -> libtpms-0.9.5.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=66cb68ef224c33991dbb56e5b46c3868
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-r1
similarity index 75%
rename from metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
rename to metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
index 2d172af6b977..0ce0535ee69a 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 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] )
+DEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] <dev-python/sphinx-5 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
@@ -8,10 +8,10 @@ INHERIT=cmake
 IUSE=debug examples icu sasl ssl static-libs test
 KEYWORDS=amd64 ~arm64 ~hppa ~riscv 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= )
+RDEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] <dev-python/sphinx-5 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	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7ebd5f2ae28b57c06a993553dbce7f28
+_md5_=2bc30c1cee636a4b8da253788fc0c2a9
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
deleted file mode 100644
index c909dc7a4b44..000000000000
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=perl? ( dev-lang/perl:= )
-DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
-EAPI=6
-HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
-INHERIT=perl-module
-IUSE=+cxx perl static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=ISC
-RDEPEND=perl? ( dev-lang/perl:= )
-SLOT=0
-SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=41cdfcfb75635665ebed4be9e37d69a9
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
index 7b27a43ce2ee..00f391210534 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
 INHERIT=perl-module
 IUSE=+cxx perl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=ISC
 RDEPEND=perl? ( dev-lang/perl:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=fe6c13bb0e1eca45787f93301e1aeba7
+_md5_=ce35c2f0981da98f6ef46b3ca8ac03dc
diff --git a/metadata/md5-cache/dev-libs/qcoro5-0.6.0 b/metadata/md5-cache/dev-libs/qcoro5-0.6.0
new file mode 100644
index 000000000000..8a1794db76e8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qcoro5-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) examples? ( dev-qt/qtconcurrent:5 dev-qt/qtwidgets:5 ) test? ( dev-qt/qtconcurrent:5 dev-qt/qttest:5 )
+DESCRIPTION=C++ Coroutine Library for Qt5
+EAPI=8
+HOMEPAGE=https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro
+INHERIT=cmake
+IUSE=dbus examples +network test websockets
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.6.0.tar.gz -> qcoro5-0.6.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ee48dd60bfbc2581695f2e3e728e0d2f
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
new file mode 100644
index 000000000000..19cf06203405
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/tree-sitter
+DESCRIPTION=Python grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
+INHERIT=tree-sitter-grammar
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/v0.20.0.tar.gz -> tree-sitter-python-0.20.0.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
+_md5_=2a54e74dc69b0bea5f46546af0c09922
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.26 b/metadata/md5-cache/dev-libs/wayland-protocols-1.26
new file mode 100644
index 000000000000..22b2572e027a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.26
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( dev-libs/wayland )
+DESCRIPTION=Wayland protocol files
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/
+INHERIT=meson
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.26.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bacf8e5e50f8625897acfe6b839f0ba5
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.20 b/metadata/md5-cache/dev-libs/xapian-1.4.20
new file mode 100644
index 000000000000..fc6754df6665
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=sys-apps/util-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Xapian Probabilistic Information Retrieval library
+EAPI=8
+HOMEPAGE=https://www.xapian.org/
+INHERIT=multilib-minimal
+IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-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(-)?] sys-libs/zlib[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/30
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.20/xapian-core-1.4.20.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c1c6ecc699886be111b4b895e90a71d5
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index 51c409e8827b..264e11c9b3a3 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3f99d728c0458f6758c2fb9f70444d83
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
index e3d55cc7d215..90552ebd006e 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.19 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.19/xapian-bindings-1.4.19.tar.xz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9d1932983dd1ab4d2bfc58538915fe8
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
new file mode 100644
index 000000000000..551fac1032ab
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=>=dev-libs/xapian-1.4.20 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DESCRIPTION=SWIG and JNI bindings for Xapian
+EAPI=7
+HOMEPAGE=https://www.xapian.org/
+INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-4 php_targets_php8-0 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/xapian-1.4.20 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
+SLOT=0
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.20/xapian-bindings-1.4.20.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=15a7c41f2dd9520ac27ab041b60bffff
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.330.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.330.0
new file mode 100644
index 000000000000..4986b4431b55
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.330.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:= >=dev-perl/Crypt-OpenSSL-Guess-0.110.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:= dev-lang/perl
+DESCRIPTION=RSA encoding and decoding using the OpenSSL libraries
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.33.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=029200e29956f2c35166ae8256d1f9d7
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 4b3df84d84c4..5b30beb38f3f 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/URI-5.110.0 b/metadata/md5-cache/dev-perl/URI-5.110.0
new file mode 100644
index 000000000000..3a31669b2c13
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/URI-5.110.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-libnet virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Test dev-perl/Test-Needs >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DESCRIPTION=Uniform Resource Identifiers (absolute and relative)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/URI
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-libnet virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/URI-5.11.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=51f6e11ca4b782ac2fc77c383c144dbc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c7bf33f00a2a..43d6e8cc5326 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.4.2 b/metadata/md5-cache/dev-python/PyPDF2-2.4.2
new file mode 100644
index 000000000000..e94434510b34
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.4.2.tar.gz -> PyPDF2-2.4.2.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.tar.gz -> PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz )
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5f7f974b7b2115a4a5c459653d7a9ea6
diff --git a/metadata/md5-cache/dev-python/aesara-2.7.3 b/metadata/md5-cache/dev-python/aesara-2.7.3
index a5885716eae9..6812488a3cbd 100644
--- a/metadata/md5-cache/dev-python/aesara-2.7.3
+++ b/metadata/md5-cache/dev-python/aesara-2.7.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
-RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aesara-devs/aesara/archive/rel-2.7.3.tar.gz -> aesara-rel-2.7.3.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=5741513b241804c8efb208d39f7d59d0
+_md5_=a011f3c513e689a2d2981dee08c28f9c
diff --git a/metadata/md5-cache/dev-python/aesara-2.7.5 b/metadata/md5-cache/dev-python/aesara-2.7.5
new file mode 100644
index 000000000000..146f2f66cdf8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.7.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aesara-devs/aesara/archive/rel-2.7.5.tar.gz -> aesara-rel-2.7.5.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a011f3c513e689a2d2981dee08c28f9c
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1 b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
new file mode 100644
index 000000000000..0a078eeeb95a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert text with ANSI color codes to HTML
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ansi2html/ https://github.com/pycontribs/ansi2html
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.8.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4f3db9dbce90c528f8d1befe50b8855c
diff --git a/metadata/md5-cache/dev-python/astroid-2.12.0 b/metadata/md5-cache/dev-python/astroid-2.12.0
new file mode 100644
index 000000000000..c44f24a20604
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.12.0.tar.gz -> astroid-2.12.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e39bf0e4f19207ce82a1a8b79d2060d3
diff --git a/metadata/md5-cache/dev-python/autobahn-22.6.1 b/metadata/md5-cache/dev-python/autobahn-22.6.1
new file mode 100644
index 000000000000..fd6a7f4c0ebd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autobahn-22.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/wsaccel-0.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snappy-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ujson-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cbor2-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/py-ubjson-0.16.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flatbuffers-1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-20.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/service_identity-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytrie-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/argon2-cffi-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/passlib-1.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
+EAPI=8
+HOMEPAGE=https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python/ https://pypi.org/project/autobahn/
+INHERIT=distutils-r1 optfeature
+IUSE=test xbr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/zope-interface-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-21.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/autobahn/autobahn-22.6.1.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=886e59c216e7b575c758611e52ae4e94
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.3.0 b/metadata/md5-cache/dev-python/bibtexparser-1.3.0
new file mode 100644
index 000000000000..baf2c7a3e2e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A BibTeX parser written in Python
+EAPI=8
+HOMEPAGE=https://github.com/sciunto-org/python-bibtexparser/ https://pypi.org/project/bibtexparser/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( BSD LGPL-3 )
+RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.3.0.tar.gz -> bibtexparser-1.3.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6c3629e2515ccf54eacf9eeb3961f532
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.12 b/metadata/md5-cache/dev-python/boto3-1.24.12
deleted file mode 100644
index b9343e5ed848..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.12.tar.gz -> boto3-1.24.12.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=41a241eaa8109dc566fb225cd48f1c86
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.17 b/metadata/md5-cache/dev-python/boto3-1.24.17
index fb740df6d8eb..4451a6396a13 100644
--- a/metadata/md5-cache/dev-python/boto3-1.24.17
+++ b/metadata/md5-cache/dev-python/boto3-1.24.17
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.24.17.tar.gz -> boto3-1.24.17.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
+_md5_=41a241eaa8109dc566fb225cd48f1c86
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.20 b/metadata/md5-cache/dev-python/boto3-1.24.20
deleted file mode 100644
index b6592135a967..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.20
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.20.tar.gz -> boto3-1.24.20.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.21 b/metadata/md5-cache/dev-python/boto3-1.24.21
deleted file mode 100644
index 5faf6b8b6940..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.21.tar.gz -> boto3-1.24.21.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.23 b/metadata/md5-cache/dev-python/boto3-1.24.23
deleted file mode 100644
index 9f74b87ffbbf..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.23.tar.gz -> boto3-1.24.23.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.25 b/metadata/md5-cache/dev-python/boto3-1.24.25
deleted file mode 100644
index fd12af423f04..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.25.tar.gz -> boto3-1.24.25.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.24 b/metadata/md5-cache/dev-python/boto3-1.24.26
similarity index 94%
rename from metadata/md5-cache/dev-python/boto3-1.24.24
rename to metadata/md5-cache/dev-python/boto3-1.24.26
index bb8ad895311a..251fcded2973 100644
--- a/metadata/md5-cache/dev-python/boto3-1.24.24
+++ b/metadata/md5-cache/dev-python/boto3-1.24.26
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+RDEPEND=>=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.24.tar.gz -> boto3-1.24.24.gh.tar.gz
+SRC_URI=https://github.com/boto/boto3/archive/1.24.26.tar.gz -> boto3-1.24.26.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.12 b/metadata/md5-cache/dev-python/botocore-1.27.12
deleted file mode 100644
index 07702e897ba4..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.12.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3730c947cd458cf16c92a60e233a9216
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.17 b/metadata/md5-cache/dev-python/botocore-1.27.17
index 69549c291ef1..00bac7bc98f0 100644
--- a/metadata/md5-cache/dev-python/botocore-1.27.17
+++ b/metadata/md5-cache/dev-python/botocore-1.27.17
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.27.17.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=251ab9b79e6c92dfb42db053bb2839a4
+_md5_=3730c947cd458cf16c92a60e233a9216
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.20 b/metadata/md5-cache/dev-python/botocore-1.27.20
deleted file mode 100644
index 1ff53a290201..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.20
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.20.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.21 b/metadata/md5-cache/dev-python/botocore-1.27.21
deleted file mode 100644
index 0e13265d7538..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.21.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.23 b/metadata/md5-cache/dev-python/botocore-1.27.23
deleted file mode 100644
index c532255fda83..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.23.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.25 b/metadata/md5-cache/dev-python/botocore-1.27.25
deleted file mode 100644
index f1c402454152..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.25.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.24 b/metadata/md5-cache/dev-python/botocore-1.27.26
similarity index 98%
rename from metadata/md5-cache/dev-python/botocore-1.27.24
rename to metadata/md5-cache/dev-python/botocore-1.27.26
index d7a11fe28c44..e835db257dd9 100644
--- a/metadata/md5-cache/dev-python/botocore-1.27.24
+++ b/metadata/md5-cache/dev-python/botocore-1.27.26
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.27.24.tar.gz
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.26.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/canonicaljson-1.6.2 b/metadata/md5-cache/dev-python/canonicaljson-1.6.2
new file mode 100644
index 000000000000..4a029eb9ccb4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/canonicaljson-1.6.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Canonical JSON
+EAPI=8
+HOMEPAGE=https://github.com/matrix-org/python-canonicaljson https://pypi.python.org/pypi/canonicaljson
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/python-canonicaljson/archive/v1.6.2.tar.gz -> canonicaljson-1.6.2.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dc7507fa3a7e0968216cfd198ea3a9eb
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.61.2 b/metadata/md5-cache/dev-python/cfn-lint-0.61.2
new file mode 100644
index 000000000000..8a3d78b3549d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.61.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/aws-cloudformation/cfn-lint/archive/v0.61.2.tar.gz -> cfn-lint-0.61.2.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=8dfe04c7b9701412ad7f5b4d2b85f2bb
diff --git a/metadata/md5-cache/dev-python/cryptography-37.0.4 b/metadata/md5-cache/dev-python/cryptography-37.0.4
new file mode 100644
index 000000000000..d9f5a08f2c6b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-37.0.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=8
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+INHERIT=cargo distutils-r1 multiprocessing
+IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography/cryptography-37.0.4.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/asn1/0.8.7/download -> asn1-0.8.7.crate https://crates.io/api/v1/crates/asn1_derive/0.8.7/download -> asn1_derive-0.8.7.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.124/download -> libc-0.2.124.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.0/download -> ouroboros-0.15.0.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.0/download -> ouroboros_macro-0.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.0.2/download -> pem-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-37.0.4.tar.gz )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bf347ae3bb9d34eab14ee21314a2683a
diff --git a/metadata/md5-cache/dev-python/dask-2022.7.0 b/metadata/md5-cache/dev-python/dask-2022.7.0
new file mode 100644
index 000000000000..093056ff6890
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2022.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/dask/dask/archive/2022.7.0.tar.gz -> dask-2022.7.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=620b26c1a2bb7ed02f529dda0bdaeb09
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.3 b/metadata/md5-cache/dev-python/docutils-glep-1.3
new file mode 100644
index 000000000000..bd2ca5eb2b0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Gentoo GLEP support for docutils
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/docutils-glep/ https://pypi.org/project/docutils-glep/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/docutils-glep/archive/v1.3.tar.gz -> docutils-glep-1.3.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=ddaf10a152c827ead7844efb0a8bd77e
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.4 b/metadata/md5-cache/dev-python/docutils-glep-1.4
new file mode 100644
index 000000000000..2148d5128dad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Gentoo GLEP support for docutils
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/docutils-glep/ https://pypi.org/project/docutils-glep/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/docutils-glep/archive/v1.4.tar.gz -> docutils-glep-1.4.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=ddaf10a152c827ead7844efb0a8bd77e
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.8 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.8
new file mode 100644
index 000000000000..d0ef4fa15df1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A locking API for expiring values while a single thread generates a new value
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache/ https://pypi.org/project/dogpile.cache/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.8.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=adbe8d5ee91e4d26a718e0e531ec91f8
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.18.0 b/metadata/md5-cache/dev-python/ecdsa-0.18.0
new file mode 100644
index 000000000000..4d846541f9fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ecdsa-0.18.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ECDSA cryptographic signature library in pure Python
+EAPI=8
+HOMEPAGE=https://github.com/tlsfuzzer/python-ecdsa/ https://pypi.org/project/ecdsa/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.18.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=be5529ccbb6ead19e80abeb2c6465a03
diff --git a/metadata/md5-cache/dev-python/frozendict-2.3.2 b/metadata/md5-cache/dev-python/frozendict-2.3.2
new file mode 100644
index 000000000000..cbf35577347c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/frozendict-2.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple immutable mapping for python
+EAPI=8
+HOMEPAGE=https://github.com/Marco-Sulla/python-frozendict https://pypi.python.org/pypi/frozendict
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Marco-Sulla/python-frozendict/archive/v2.3.2.tar.gz -> frozendict-2.3.2.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5838783062968c3917222d0ae408b865
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.50.0 b/metadata/md5-cache/dev-python/hypothesis-6.50.0
new file mode 100644
index 000000000000..dac1cd1e50d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.50.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+),sqlite] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.50.0.tar.gz -> hypothesis-6.50.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f2ad4a02a4a15b7c57e327b8c93b6043
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.50.1 b/metadata/md5-cache/dev-python/hypothesis-6.50.1
new file mode 100644
index 000000000000..b2bcf75e4c89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.50.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+),sqlite] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.50.1.tar.gz -> hypothesis-6.50.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f2ad4a02a4a15b7c57e327b8c93b6043
diff --git a/metadata/md5-cache/dev-python/imapclient-2.3.1 b/metadata/md5-cache/dev-python/imapclient-2.3.1
new file mode 100644
index 000000000000..96abe4343a3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imapclient-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=easy-to-use, pythonic, and complete IMAP client library
+EAPI=8
+HOMEPAGE=https://github.com/mjs/imapclient
+INHERIT=distutils-r1
+IUSE=doc examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mjs/imapclient/archive/2.3.1.tar.gz -> imapclient-2.3.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=abb89b16faed91d80a629d45c0cfa9ce
diff --git a/metadata/md5-cache/dev-python/inflect-5.6.1 b/metadata/md5-cache/dev-python/inflect-5.6.1
new file mode 100644
index 000000000000..3e728b3af70b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/inflect-5.6.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Correctly inflect words and numbers
+EAPI=8
+HOMEPAGE=https://pypi.org/project/inflect/ https://github.com/jaraco/inflect/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/inflect/inflect-5.6.1.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e5ccee3d8252cf122fe4c2bc86089caa
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.1 b/metadata/md5-cache/dev-python/ipykernel-6.15.1
new file mode 100644
index 000000000000..7bdaf7ff705a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.15.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[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/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[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/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[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/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.1.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b8dca97c37f5e4527036b5d4729db0fe
diff --git a/metadata/md5-cache/dev-python/ipyparallel-8.2.1 b/metadata/md5-cache/dev-python/ipyparallel-8.2.1
deleted file mode 100644
index 897d81bd867f..000000000000
--- a/metadata/md5-cache/dev-python/ipyparallel-8.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[test] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Interactive Parallel Computing with IPython
-EAPI=8
-HOMEPAGE=https://ipyparallel.readthedocs.io/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-8.2.1.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=151304e537439c5209c5584298bb7744
diff --git a/metadata/md5-cache/dev-python/ipyparallel-8.3.0 b/metadata/md5-cache/dev-python/ipyparallel-8.3.0
index 776c0057441b..c80e27a7178b 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-8.3.0
+++ b/metadata/md5-cache/dev-python/ipyparallel-8.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipyparallel.readthedocs.io/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 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/i/ipyparallel/ipyparallel-8.3.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8bc60e5664fc0f088e8496387fc57a94
+_md5_=2521bcc5bcd90285c6acfb12fb75d3f4
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.11.1 b/metadata/md5-cache/dev-python/jupyter_core-4.11.1
new file mode 100644
index 000000000000..177138a01d9f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.11.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipython-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] ) ) ) test? ( dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core common functionality of Jupyter projects
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.11.1.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5ef587be990985aa2350adfc2aff569b
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0 b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
new file mode 100644
index 000000000000..8b30be770eff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.15.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e67edb01b013f4c7ea560f2fd5a1053f
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.10 b/metadata/md5-cache/dev-python/kaitaistruct-0.10
new file mode 100644
index 000000000000..958b9381f35a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.10
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Kaitai Struct runtime for Python
+EAPI=8
+HOMEPAGE=https://kaitai.io/ https://github.com/kaitai-io/kaitai_struct_python_runtime/ https://pypi.org/project/kaitaistruct/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.10.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=ef674485512804b1abe2a4ba1f8eba11
diff --git a/metadata/md5-cache/dev-python/matrix-common-1.2.1 b/metadata/md5-cache/dev-python/matrix-common-1.2.1
new file mode 100644
index 000000000000..1525653f38f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matrix-common-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common code for Synapse, Sydent and Sygnal
+EAPI=8
+HOMEPAGE=https://github.com/matrix-org/matrix-python-common https://pypi.org/project/matrix-common/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/matrix-python-common/archive/v1.2.1.tar.gz -> matrix-common-1.2.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=452bd7c3fcc5c707ebad0f1b661d39d2
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.1 b/metadata/md5-cache/dev-python/numpy-1.23.1
new file mode 100644
index 000000000000..1394fbb32b37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.23.1
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.23.1.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.1.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.1.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.1.pdf )
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b1c2fb13d2e3788671b03451320d7f58
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7 b/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
deleted file mode 100644
index 46c312e337a5..000000000000
--- a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/0.12.7.tar.gz -> pdm-pep517-0.12.7.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2b622916e9d3550a8c50e44c0654077c
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-1.0.0 b/metadata/md5-cache/dev-python/pdm-pep517-1.0.2
similarity index 97%
rename from metadata/md5-cache/dev-python/pdm-pep517-1.0.0
rename to metadata/md5-cache/dev-python/pdm-pep517-1.0.2
index 92a59f493ef1..9ddb3a8fbe2d 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-1.0.0
+++ b/metadata/md5-cache/dev-python/pdm-pep517-1.0.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/1.0.0.tar.gz -> pdm-pep517-1.0.0.gh.tar.gz
+SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/1.0.2.tar.gz -> pdm-pep517-1.0.2.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b622916e9d3550a8c50e44c0654077c
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.51 b/metadata/md5-cache/dev-python/phonenumbers-8.12.51
index 41b96ffde8a0..fab01b72ab00 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.51
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.51
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/daviddrysdale/python-phonenumbers/archive/v8.12.51.tar.gz -> python-phonenumbers-8.12.51.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=edad0be3a7edc661e4f25ca06ba32ce7
+_md5_=ace22bdcc29265ea793f8ce1640c3bd8
diff --git a/metadata/md5-cache/dev-python/pychromecast-12.1.4 b/metadata/md5-cache/dev-python/pychromecast-12.1.4
new file mode 100644
index 000000000000..7f4ecebcc342
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pychromecast-12.1.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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 module to talk to Google Chromecast
+EAPI=8
+HOMEPAGE=https://github.com/home-assistant-libs/pychromecast
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zeroconf-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyChromecast/PyChromecast-12.1.4.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d1bbc16bdeb6e0f9d3fb36dcfd59a491
diff --git a/metadata/md5-cache/dev-python/pymacaroons-0.13.0 b/metadata/md5-cache/dev-python/pymacaroons-0.13.0
new file mode 100644
index 000000000000..edcf87ac9d64
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymacaroons-0.13.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PyMacaroons is a Python implementation of Macaroons.
+EAPI=8
+HOMEPAGE=https://github.com/ecordell/pymacaroons https://pypi.org/project/pymacaroons/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ecordell/pymacaroons/archive/v0.13.0.tar.gz -> pymacaroons-0.13.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=38d188639953865f6237b66890c225ec
diff --git a/metadata/md5-cache/dev-python/regex-2022.7.9 b/metadata/md5-cache/dev-python/regex-2022.7.9
new file mode 100644
index 000000000000..42db6ab37f67
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2022.7.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2022.7.9.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1ad205f76c461be4a3a0f2e7ef50a02b
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.4.1 b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
new file mode 100644
index 000000000000..c5ee485e90a9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A plugin for setuptools to build Rust Python extensions
+EAPI=8
+HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
+INHERIT=distutils-r1 cargo
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools-rust/setuptools-rust-1.4.1.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=74da5ca0e633e5b15a163d7a56ef03fa
diff --git a/metadata/md5-cache/dev-python/signedjson-1.1.4 b/metadata/md5-cache/dev-python/signedjson-1.1.4
new file mode 100644
index 000000000000..cca12a89118b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/signedjson-1.1.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Signs JSON objects with ED25519 signatures.
+EAPI=8
+HOMEPAGE=https://github.com/matrix-org/python-signedjson https://pypi.python.org/pypi/signedjson
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/python-signedjson/archive/v1.1.4.tar.gz -> signedjson-1.1.4.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4b901ffb6d664a21c267c30dc07d0707
diff --git a/metadata/md5-cache/dev-python/sphinx-5.0.0 b/metadata/md5-cache/dev-python/sphinx-5.0.0
deleted file mode 100644
index 2493491e4ea6..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python documentation generator
-EAPI=8
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx/ https://pypi.org/project/Sphinx/
-INHERIT=distutils-r1
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-5.0.0.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6023c5aed09c192d11598d891b534bf8
diff --git a/metadata/md5-cache/dev-python/sphinx-5.0.1 b/metadata/md5-cache/dev-python/sphinx-5.0.1
deleted file mode 100644
index cfd36c1077af..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-5.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python documentation generator
-EAPI=8
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx/ https://pypi.org/project/Sphinx/
-INHERIT=distutils-r1
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-5.0.1.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=124ec735f43d02dc2e0b877c7ee6b874
diff --git a/metadata/md5-cache/dev-python/sphinx-5.0.2 b/metadata/md5-cache/dev-python/sphinx-5.0.2
index 0faa1304d172..0b7c7a316ea7 100644
--- a/metadata/md5-cache/dev-python/sphinx-5.0.2
+++ b/metadata/md5-cache/dev-python/sphinx-5.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx/ https://pypi.org/project/Sphinx/
 INHERIT=distutils-r1
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-5.0.2.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=4efd6073b2af9bc246e04a9a09cb3105
+_md5_=59dc184ffbd2637b9b99a083e8264aca
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.3.2 b/metadata/md5-cache/dev-python/spyder-kernels-2.3.2
new file mode 100644
index 000000000000..b2850bd8630c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Kernels used by spyder on its ipython console
+EAPI=8
+HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/ipykernel-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-6.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-7.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/spyder-ide/spyder-kernels/archive/v2.3.2.tar.gz -> spyder-kernels-2.3.2.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=44400226b7591626b7970e41bec8423f
diff --git a/metadata/md5-cache/dev-python/tldextract-3.3.1 b/metadata/md5-cache/dev-python/tldextract-3.3.1
new file mode 100644
index 000000000000..56620ca2bd7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tldextract-3.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tldextract/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tldextract/tldextract-3.3.1.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=89a00527a853129fd6eebf3fc2fe7c53
diff --git a/metadata/md5-cache/dev-python/toolz-0.12.0 b/metadata/md5-cache/dev-python/toolz-0.12.0
new file mode 100644
index 000000000000..2f9f3c4f957e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toolz-0.12.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=List processing tools and functional utilities
+EAPI=8
+HOMEPAGE=https://github.com/pytoolz/toolz/ https://pypi.org/project/toolz/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/toolz/toolz-0.12.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f29701953e62171fe5da283bb541c0a3
diff --git a/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0 b/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
new file mode 100644
index 000000000000..6136968ec297
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unpadded Base64
+EAPI=8
+HOMEPAGE=https://github.com/matrix-org/python-unpaddedbase64 https://pypi.python.org/pypi/unpaddedbase64
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/python-unpaddedbase64/archive/v2.1.0.tar.gz -> unpaddedbase64-2.1.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f2e03969f73b4650dc84b068317fe3a2
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
index 648c33d1a33a..a5478adc89a8 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/georuby-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a92386c837e767d8940ea868412e808b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1196335d9143..96ef586dc371 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
index d94b02a5e9b1..da9af3d86e81 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b64871188d719265a73b27d4d7fb2ed
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
index 9ed07ddbb446..38e1e1f9e676 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=47904ce9156ad527f99374815c32c2a6
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.8 b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
index 067c55cadf89..c1d612bb6d58 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.8
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.8.tar.gz -> acme-client-2.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b22cb712fc216cb961e0fe9eadb44c7c
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.9 b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
index 267021f9b881..e795e7d079af 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.9
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.9.tar.gz -> acme-client-2.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=363c1183f19cbda1b47813357233bc9a
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.2.8 b/metadata/md5-cache/dev-ruby/actioncable-5.2.8
index bd29c63b4bb0..cb7d1bf2c5a8 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.2.8
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bdc31c85736bccd3bb36014c0c289827
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.5 b/metadata/md5-cache/dev-ruby/actioncable-6.0.5
index ecdb425dadd5..92ae7ac84c33 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d4fc592a25b4d7d6649b3dee08717dcf
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.5.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
index 1a716be23e5c..f504588b4196 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e2df09a774273360f5fa7bb24bdaf440
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.6 b/metadata/md5-cache/dev-ruby/actioncable-6.1.6
index 6b6503e3b3bc..d78c17cafc3e 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e2df09a774273360f5fa7bb24bdaf440
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.4 b/metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
index 94dd6a9504f2..8ade0be08a6e 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c460056f225257c9e28a9f645288d902
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.3 b/metadata/md5-cache/dev-ruby/actioncable-7.0.3
index 622b1cb2aa76..cb5fd510a65e 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actioncable-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1c0d86314c6e3d7833734b1efae29b0c
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
index 89f02d66b963..f7be3578beda 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b7537ec3040432b4474c35ca5a69cbe
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
index 5d39e56b097e..4a7e42da3bf6 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=199caa3c310bdba631da14049d6461b9
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
index 189a6b8a7440..4f20e8bff0fa 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=199caa3c310bdba631da14049d6461b9
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
index 43d996be024c..6e596231d947 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b559f5383572c380c5039e9eb0f98edd
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
index 04b829ab65c8..5f05ffa8650e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4370b673bfa99d384cded93b339a28a0
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.8 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.8
index 5b97aabbd06a..4d8e0f8a7138 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.2.8
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=895d8bb7729e1cf2b44778416b0b7f8e
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.5 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.5
index 85a8137764a9..67fc8fb6aca7 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=980245bc503e71f0c30720d6f7950b19
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
index 6c243a5ac286..e2b381f32a8a 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0683d1d03e7661a60982112e2c97e77f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.6 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6
index 7140389a80fb..3a7c82eaed4d 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0683d1d03e7661a60982112e2c97e77f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
index 3adde7800e18..ad3b71b50562 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0c59f72c1ef6df67dd2b7c73edaac802
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.3 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.3
index 00b9dd0392f0..607623cb1728 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actionmailer-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d2cabff649c45209e0285cd2da5165ab
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.8 b/metadata/md5-cache/dev-ruby/actionpack-5.2.8
index 9f2a6e9aa7aa..0469512f2b98 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.8
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9dd7af0c9afed9efde972f0daf8bbf8
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.5 b/metadata/md5-cache/dev-ruby/actionpack-6.0.5
index 579f076da6d1..6fcdbfa9ff66 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5ee170468930e760a3d30e24a2bc131d
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.5.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
index 805b56c9e522..4f48ddcd7772 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a4b8dacc822ddf6d8e38789bf6152cc2
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.6 b/metadata/md5-cache/dev-ruby/actionpack-6.1.6
index ade6efc7f715..7dc60cf7b176 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a4b8dacc822ddf6d8e38789bf6152cc2
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.4 b/metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
index 36bb0f625787..cfed33262652 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1a6f624e785a340b2a37bfbf9f7aac5a
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.3 b/metadata/md5-cache/dev-ruby/actionpack-7.0.3
index f0450a969624..87923124a01f 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actionpack-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1a6f624e785a340b2a37bfbf9f7aac5a
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
index 2b4eebbfa12f..d3ec0a58695a 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8076698af86e14929447cb6483e0e31e
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
index a0b64fde08ae..3bc9f3c099a4 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aab15262fa34f5adef21259efb46dd9f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
index a40e479048c0..79241e691ee4 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f1b16d037f36ad818dd985fb8c4c8f5e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.5 b/metadata/md5-cache/dev-ruby/actiontext-6.0.5
index 75841579f54d..7f18b07193ab 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c48677c218d45f483116384fb92206c
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.5.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
index a2df982c0ce2..892dbcbe00b1 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=918a40b7a7ef5d11b3cf7d067b99f33c
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.6 b/metadata/md5-cache/dev-ruby/actiontext-6.1.6
index fd6d4d04278a..9e0f41908e55 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=918a40b7a7ef5d11b3cf7d067b99f33c
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.4 b/metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
index b03218deba93..68279fa675ac 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=67fc3715479b0b9b9841373c27bd7695
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.3 b/metadata/md5-cache/dev-ruby/actiontext-7.0.3
index 80f67d2655b8..c14d8f02d8b6 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actiontext-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bcdf57ff4f61c0eacdf78918a4d98939
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.8 b/metadata/md5-cache/dev-ruby/actionview-5.2.8
index 632815e6e7ba..292a937e187e 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.8
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b83bbf84ddec71e854d1d0e10bce1ea9
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.5 b/metadata/md5-cache/dev-ruby/actionview-6.0.5
index b03addcf6a11..261fad11c4df 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.5
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4edd6a2699526ba46eb7bdd4d1679bd
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.5.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.5.1
index 668c890f7bd0..3a54c50acf90 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0444dcb96e929bf1aac61dbd90738151
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.6 b/metadata/md5-cache/dev-ruby/actionview-6.1.6
index cb492c7d7edd..b92a31fdfe7a 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.6
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0444dcb96e929bf1aac61dbd90738151
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.2.4 b/metadata/md5-cache/dev-ruby/actionview-7.0.2.4
index b95fbe264868..c4a4d7aad867 100644
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/actionview-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4bedd7b8d11762be57b49d6b988a61cc
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.3 b/metadata/md5-cache/dev-ruby/actionview-7.0.3
index bdf28284ed22..a2ba66332c54 100644
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.3
+++ b/metadata/md5-cache/dev-ruby/actionview-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4bedd7b8d11762be57b49d6b988a61cc
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.8 b/metadata/md5-cache/dev-ruby/activejob-5.2.8
index 9ecb11b7e9f0..66cffb7634af 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activejob-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed9a46c617e4c536f5a2c6066f1a53cc
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.5 b/metadata/md5-cache/dev-ruby/activejob-6.0.5
index 7d014cc9f981..def26022b3c7 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5805ba7eff52e95fb218c7a6f7d93c69
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.5.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.5.1
index a0a2320fe6a6..3694186f8b29 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=18426ae0fca3b3594dd7b820cfd5a8a1
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.6 b/metadata/md5-cache/dev-ruby/activejob-6.1.6
index 36f54348bee8..96886c64cb71 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.6
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=18426ae0fca3b3594dd7b820cfd5a8a1
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.2.4 b/metadata/md5-cache/dev-ruby/activejob-7.0.2.4
index fd34b5f07876..8daff4f5c154 100644
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/activejob-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8a7c31c352d5a24a322620335eb1e330
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.3 b/metadata/md5-cache/dev-ruby/activejob-7.0.3
index 8e9c7ac66a31..f1bc1cadcc46 100644
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.3
+++ b/metadata/md5-cache/dev-ruby/activejob-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=449b95a057d031a51c54f3c723ee4d9a
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.2.4 b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
index 0e26bc6890d7..bd99ce2e294e 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-5.2.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/activeldap-5.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=966764b50fa5a29ff4a5040d337f8efa
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.0.4 b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
index 17e8bacf1d22..abc1ef72be4d 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7283440d84d2da702ea70c7bed35312d
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.1.0 b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
index 8fd4ad703015..bbfeac48880c 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e3a6a95240da5348abd9bae1dd007b3e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.8 b/metadata/md5-cache/dev-ruby/activemodel-5.2.8
index b9f86e5a6cb2..4432d8c89590 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1cae9f3214b2a15fede78dbe3ea2e925
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.5 b/metadata/md5-cache/dev-ruby/activemodel-6.0.5
index 095eebb2f187..c5fd81a18e9e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=65ccd154a585ccbeb6990f7e3b116813
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.5.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
index fb7cb93b8acb..15463c7e9da5 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5b6af3755e7fb4765a00cf4f0dfe81c3
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.6 b/metadata/md5-cache/dev-ruby/activemodel-6.1.6
index 483d7c91ae48..c51e4b0b7abb 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.6
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5b6af3755e7fb4765a00cf4f0dfe81c3
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.4 b/metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
index e7da39218407..12acdfa4354e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5cbfdc7ae82dd38703bd4c0408e5af4c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.3 b/metadata/md5-cache/dev-ruby/activemodel-7.0.3
index 10b8dc3b19bd..e62583d7413b 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.3
+++ b/metadata/md5-cache/dev-ruby/activemodel-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5cbfdc7ae82dd38703bd4c0408e5af4c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
index c5c77c531860..497ed89839b8 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5fd4d328a40948de0e991b81170d8c84
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
index ad4607280805..c317a616cd1d 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44ff6888f3b69742925b86fd385f645b
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.8 b/metadata/md5-cache/dev-ruby/activerecord-5.2.8
index 8d78e2793e61..527778670b06 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ee1f8f22e609e6779bbbcc7e126a74ab
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.5 b/metadata/md5-cache/dev-ruby/activerecord-6.0.5
index ce3c93b8c57e..b9853f05f6c2 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ddbec47ccbd477a58630467f52289a32
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.5.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
index 98e44c0eb8ce..6c6fff5c9617 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=89962ae22749dd4d20aff137ca9bba46
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.6 b/metadata/md5-cache/dev-ruby/activerecord-6.1.6
index 3f3e3e835d7b..952c234eb685 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.6
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b749196966197e40b609bb497ff6c08
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.4 b/metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
index 9bdfcbff0cbb..589e4b9741c1 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6270fc7d042b423998f7e6a81e7c7cc0
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.3 b/metadata/md5-cache/dev-ruby/activerecord-7.0.3
index 42ea7f478dd6..385b471d1fbc 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ae838b730479c409f8751691d04aa3d
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.8 b/metadata/md5-cache/dev-ruby/activestorage-5.2.8
index 953cf8af32d4..f7e9834910d1 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a26c869df8e4d9b3d9a1b93c1f20284c
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.5 b/metadata/md5-cache/dev-ruby/activestorage-6.0.5
index d2bdd4631932..d55c07a09caf 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d60415a2324bfaccd6223c34aedbcbe8
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.5.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
index 055d6dd9b98f..393229c3d113 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ea36ad43777457cd414aa323bf7b6bf
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.6 b/metadata/md5-cache/dev-ruby/activestorage-6.1.6
index 53cd5ca4c04f..7a0005f71198 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.6
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ea36ad43777457cd414aa323bf7b6bf
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.4 b/metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
index e457edbdec82..f9105dd996bb 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5ae84932cd67ef1d794eefe68d170e3
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.3 b/metadata/md5-cache/dev-ruby/activestorage-7.0.3
index 8bb1bbede2f7..56014e3e083e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.3
+++ b/metadata/md5-cache/dev-ruby/activestorage-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c08d9c4c0b64118d67c34cf2718c52c1
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.8 b/metadata/md5-cache/dev-ruby/activesupport-5.2.8
index d2f70a3307cd..01ddfab899ca 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e65df66d3a24fd86295d1b51b6ab2bf8
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.5 b/metadata/md5-cache/dev-ruby/activesupport-6.0.5
index fab95461bd26..8e366b1fc879 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=025e5db2e9430c4a0f6c6612b2d6bc8f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.5.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
index c9978595e1be..63a6759ff780 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dbf614c58acb2862c61f71636ed439ee
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.6 b/metadata/md5-cache/dev-ruby/activesupport-6.1.6
index 5dc9f57051fb..881e625dc748 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=53d9ed44dce5a11e5cfc379cf14c0d76
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.4 b/metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
index 520460576ce1..421888658bdf 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4fdb37a81801d40806a323d569a0e749
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.3 b/metadata/md5-cache/dev-ruby/activesupport-7.0.3
index 713b66787f32..a28cec334c5b 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.3
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8ed8624d292c01a84c4ca41ceb87ca75
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
index b80a379f84a7..fa8642904a12 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b4f221d8acdf9fba8403f9f5d19e43d9
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.0 b/metadata/md5-cache/dev-ruby/addressable-2.8.0
index 07078818a7ac..f328f69801ce 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6591d25f9e64d17b592af4714bec9ec5
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2-r1 b/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
index 4e89377ad01a..5077ad716e2f 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ae-1.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=969f883c6b3fe1ef514b0e12e8ffbb2c
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1 b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
index c438bc946986..1e6bf24f3de7 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=741f73b1c77e8c0d1c5a98613a8f7018
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
index f41388c1e20a..1feb945c17f7 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4f1122e2655f638f72db2481f19b5479
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
index f4bb56d4064d..985c11e2e61b 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c72856f8dbc6d7ab21892bc39d66dc74
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
index 1a5398f20f46..3c3b31c96c0c 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4d29cb92a1422671ce5a1f327b31fcda
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1 b/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
index b92e84727812..34a0671071ce 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71a1c2b7a4dcd41a33166f2166fc19f0
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.1 b/metadata/md5-cache/dev-ruby/amatch-0.4.1
index 640bf3e5c220..ad3b8e0489ef 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71a1c2b7a4dcd41a33166f2166fc19f0
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.5 b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
index 565dc1ac4258..881e93a254a1 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.5
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ammeter-1.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=79b787caf42b081b44893b8d640f4003
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
index 14a59d820d6f..a1d59840f81d 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amq-client-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4348c652deecd37eb10492e431cf477f
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
index c7ae425e4f9f..3e0d04f7fbbe 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=93db0c8794fba22986e0429856d721cb
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1 b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
index 3f875ed5eb66..c693b16b9e19 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f60933456188702deff23865bbb4dfc7
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
index dc78d84908b4..6ca7da23efad 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/annoy-0.5.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8601b798f00c8b47c15187a7f040ad4c
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1 b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
index 1468cc0c15a7..40f0615c3503 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44039b01ba3592b91c05482431154a89
diff --git a/metadata/md5-cache/dev-ruby/arel-9.0.0 b/metadata/md5-cache/dev-ruby/arel-9.0.0
index c07a3efc16c5..09cc5c588232 100644
--- a/metadata/md5-cache/dev-ruby/arel-9.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-9.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9.0
 SRC_URI=https://github.com/rails/arel/archive/v9.0.0.tar.gz -> arel-9.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=157616a3bb65aff1dc0834f97e08daaa
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
index 125a3f4a5b89..0f513e7eccfa 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/arel-helpers-2.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6c6503f749a420d717eda6ba11010dad
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.1.0 b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
index f7b52034a7a4..26c4259194b5 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15f49a2e4704a27f26318cb8df26928c
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
index e4b5fb21ea62..9dd4cbaad6f7 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.15.tar.gz -> asciidoctor-2.0.15.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6a0c9ab36202bd8912218ad7e5b44867
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
index 0a321f872041..df706ffd41e1 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.16.tar.gz -> asciidoctor-2.0.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f3917a1fe63bab4a7021df38e0914c4e
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
index 2b0406cafb10..fa7a60be0594 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0e33da7516227030d618cedcdfce831
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
index e4f2b47e8a49..1e6f01614d45 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45a4a99bed50f4bdfa4460c1606cfd49
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index 32d0ce0fa5c3..9918b6716b1b 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b0bafd90840842d302187198832836dd
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.3 b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
index 2d8e6d917255..e0d3aae696d0 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.3
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=00e96d60bcd53aec0ae865dbeee6119c
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.4 b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
index 3315863b99ea..a63e821f6d17 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4c6345618d223754a39be52b612f85be
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.2 b/metadata/md5-cache/dev-ruby/ast-2.4.2
index 2ac6f1fbabfb..e17c0852cc2c 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.2.tar.gz -> ast-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=056df2682a16999cdab6904693119ca2
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
index 90a840c428d8..4a5c25e396cf 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=30bb6fc6668b52e5e8f572a23a39cb30
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1 b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
index df66e59a9a63..ab5b1d3f9871 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dbcbf813b40f264c87673a8f273f3ddc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
index 2da6a02c2297..c24caad72e19 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.3.1.0.tar.gz -> autoprefixer-rails-10.3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=09453092158ca280c75e92c2527cf90f
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0
index 92cb0e88ad77..ce921dd4bb2a 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.4.2.0.tar.gz -> autoprefixer-rails-10.4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=922140e4c043ce04789fefce2df3d109
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
index 0801e66c57a5..2548947f580a 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.4.7.0.tar.gz -> autoprefixer-rails-10.4.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ac7c6d7ac990d4c6a4dbeace82faaa6d
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
index c1767cf3f063..799f5ff4c47e 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=12c3e247e33c6eb20ae94a2afe66826f
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
index 66676ba47abd..91b05dd4ff88 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50dc9cbc5802ea3e52bc950266b04214
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
index 223772c2ede2..8d8e6dbbf3e4 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.297.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
index df971498b16c..6f7d2e74f160 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.298.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
index 58118075e57b..1dfbce5d60cd 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.370.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=449d47795834ca53ed7f616e69c53d58
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
index 95475fca9867..94839107e07c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e112891746cf5589e768608be60634ea
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
index 63deabb46fee..148763eda874 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27ba17c94e52a7296c5b3e473510979e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0 b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
index 738d4e58c38c..6c0241e01988 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/aws-sdk-core-3.94.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b89bd8bd0611b8fb6906c44b205d90c2
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
index 228f93ef097d..d82a44176ee9 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed4697db5d6fb27328bec27fb7101729
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
index be6a1c93baf2..cc33734c8bfd 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6418bbff212124431dcf3f780f439b90
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
index 26be9df63287..be5ae994c027 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
index f19900de2d2e..306eadf853a2 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0
index 3d422ae6eddd..ab52f70083d7 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5d185059e2cd75ea7b8ba280dd43a369
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
index 0b3bcc61d31d..da2df00b4218 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/axiom-types-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=476e23746ee0b2c366b6496bc9d4c89f
diff --git a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1 b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
index e9c700f2770c..1e2e4869fbdb 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+++ b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.20.2.tar.gz -> backports-3.20.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=981c27aaf2462af8e78d842a672ee410
diff --git a/metadata/md5-cache/dev-ruby/backports-3.21.0 b/metadata/md5-cache/dev-ruby/backports-3.21.0
index 5a2608b9f9f9..f5c7434116c1 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.21.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.21.0.tar.gz -> backports-3.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a6c34d6e9c8d7f30f51e4a322ae28bb8
diff --git a/metadata/md5-cache/dev-ruby/backports-3.23.0 b/metadata/md5-cache/dev-ruby/backports-3.23.0
index 3bacbd0f15d2..849f410d9039 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.23.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.23.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.23.0.tar.gz -> backports-3.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=78d5a74e29e7c3de1f1b2fdb04d0b6c2
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
index 40ea18689e40..38ae0f85f48e 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=161f67045477fc0156db2397d4332210
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
index 298631386502..91b0d7025497 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a106c850c825dfbd11c54956f867eef6
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index 8f1e68feaf57..20acd137f0a4 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0ca5aa1890a31535de486d464744cb6e
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4 b/metadata/md5-cache/dev-ruby/base32-0.3.4
index cd786a5dea3d..3808212ba3bf 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c2ad98d96169e9dd8fe48a448e1a8086
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1 b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
index 466c21796493..79c657d63285 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=338f7a9d7e7ac46a8e453f777d5bb879
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
index 1066b8a2fe70..38e4c75395b1 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cb2c00c52c7f765a05f7aa1c37b957f2
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
index 063e34119d35..ed1fe98cc17e 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a44b942d381778a683d5b025cf644f6b
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
index 28c3ab67c3ff..021715d4cfd8 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7a1fe2b1a5c846edf5d6bfe65740ea81
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
index a2292494e304..08e2693ca37a 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6a0fc14ac8cfd6d480aaf05fd3cdc342
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
index 0aff8a32cea6..81527b4117a7 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=601360ad39e17b43da2b365c6ec7ad24
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
index 2c7ce9e474c9..44143bad8162 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3e44c8bf197978b0c82252b7b9b6a37a
diff --git a/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0 b/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
index 5909222913d5..80abfe4ce01c 100644
--- a/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
+++ b/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/evanphx/benchmark-ips/archive/v2.10.0.tar.gz -> benchmark-ips-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=04b7a88576a31a5beae8462cd8e40230
diff --git a/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2 b/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
index e675926017f5..3321e72525a5 100644
--- a/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
+++ b/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/benchmark-ips-2.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ca1a5a6afd6dd5d56fa60f823f1679bf
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
index e1406648f80f..c8d487359b82 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/best_in_place-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=0b8a87fc7deedaadeed23215137bdf52
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.10 b/metadata/md5-cache/dev-ruby/bindata-2.4.10
index f546b9e8908d..8d816b79a929 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.10
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=21f7c40d87a0bed9d38c5d7a4237c1a4
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
index e58bb81dc87c..08d4b8b0e9ff 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=433c12a37971feabf5802e1f298131d8
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
index 88f11c73ddb1..edbf4dc13fb0 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c5ec3430591edd54be894543d426b8c6
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.17 b/metadata/md5-cache/dev-ruby/bit-struct-0.17
index d6043538d8db..d491be2543c6 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.17
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a17ca17abc713fbdf65e37418783f3b8
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
index b9b08c8c3480..b80a820c26f6 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c00bd4512a02c2971c4371309e7fe373
diff --git a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901 b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
index f97223d199da..813b77316b84 100644
--- a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
+++ b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arvydas/blinkstick-ruby/archive/89e3f621132c2571d5f7c636b3962ff1b0a64564.tar.gz -> blinkstick-1.0.1_p20150901.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4e8c1a65a1c7b94447ee7b3f6f14cd35
diff --git a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1 b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
index 50a62db32638..a412787ac22a 100644
--- a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
+++ b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arvydas/blinkstick-ruby/archive/89e3f621132c2571d5f7c636b3962ff1b0a64564.tar.gz -> blinkstick-1.0.1_p20150901.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4ebb1af493cf22c080f205401b80c672
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index 5e8a02701977..2bec5b5457fe 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bogus-0.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=59c595f2f353eb045efdb540dd6c9a3d
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1 b/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
index 38c84488d166..0c7cc46f5466 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bogus-0.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ad8d3ace75eb098fba3655c150f274e
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1-r1 b/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
index fc80ce215968..f54e84b5334d 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/brass-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7d35672104850d874b71ca16b7251967
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2 b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
index 0d959b71da9c..06dafbbc6158 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f847235360e6f32cbc7da9680621d123
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
index 76001f8ae4ab..f6762d0a7e56 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27743c2f0f10d77a68a5e7d16d59522e
diff --git a/metadata/md5-cache/dev-ruby/bson-4.12.0 b/metadata/md5-cache/dev-ruby/bson-4.12.0
index 727b47805e47..3db5f6e9b394 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.12.0.tar.gz -> bson-4.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=abdd61a9a2a1333860f2db5fedea37a5
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
index a40031f7d428..7ad5eeccac10 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/buftok-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4ff448d507e3736d41a1cfd18704a7e5
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.3.0 b/metadata/md5-cache/dev-ruby/buftok-0.3.0
index 382ceeeb033c..d4f69034c3c3 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.3.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/buftok/archive/v0.3.0.tar.gz -> buftok-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8f5a7645281af6cfde166682f081d5ac
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4 b/metadata/md5-cache/dev-ruby/builder-3.2.4
index 320f46f5deca..08185297eac4 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3063ed78578972e78c45e8fe776bace
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
index fd0fb4381e27..6351f643606c 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8b7de3abe8d493552ded586a034bf325
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.1.4 b/metadata/md5-cache/dev-ruby/bundler-2.1.4
index 988d872ab35f..a2805238d18d 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.1.4
+++ b/metadata/md5-cache/dev-ruby/bundler-2.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed0691f5beb053e0ceec368550b02e99
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.18 b/metadata/md5-cache/dev-ruby/bundler-2.2.18
index be1ad2e7e6a6..4a95310a056d 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.18
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b744f9146e12cf32f88ad918ee35af9b
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.24 b/metadata/md5-cache/dev-ruby/bundler-2.2.24
index ffa44fa5b22e..433fe3859898 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.24
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.24
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.24.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.25 b/metadata/md5-cache/dev-ruby/bundler-2.2.25
index 9764bb39bcf3..4dfec9e1366a 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.25
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.25
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.29 b/metadata/md5-cache/dev-ruby/bundler-2.2.29
index 035d2b6390c3..f4ee379fcc76 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.29
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.29
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.29.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.31 b/metadata/md5-cache/dev-ruby/bundler-2.2.31
index 706803474fa2..eedce0523ac2 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.31
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.31
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.31.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.33 b/metadata/md5-cache/dev-ruby/bundler-2.2.33
index 6f943b52180c..4e8240555dd3 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.33
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.33
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.33.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=11e43a50e3c16f5f43da4c3a5529babd
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.3.8 b/metadata/md5-cache/dev-ruby/bundler-2.3.8
index 118bff2c85bc..d6b3c988a98a 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.3.8
+++ b/metadata/md5-cache/dev-ruby/bundler-2.3.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.3.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2739d51e4bcd81c58f9e32538f2839fd
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
index b7035d7b8639..9940a971a96e 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=049305a657a468961c284607c6b87ade
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
index 996f7cd4288a..944de630aef3 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bbe7252eddae4622000fb12155130a80
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.17.0 b/metadata/md5-cache/dev-ruby/bunny-2.17.0
index 9e6f87d2073b..4a9dbcb307fe 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.17.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bunny-2.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=592a6e5085246a75237cc06fbae15048
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.19.0 b/metadata/md5-cache/dev-ruby/bunny-2.19.0
index 83259c5d1ff3..226f034ad8a4 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.19.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.19.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.19.0.tar.gz -> bunny-2.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b15c420e09fc180f75ce3c56b3445b56
diff --git a/metadata/md5-cache/dev-ruby/c21e-2.0.0 b/metadata/md5-cache/dev-ruby/c21e-2.0.0
index 2852855a8f2d..45b01500547d 100644
--- a/metadata/md5-cache/dev-ruby/c21e-2.0.0
+++ b/metadata/md5-cache/dev-ruby/c21e-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/c21e-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2f266f4d5c04c0726715fee0264883d5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
index 0cf06d0d1680..4fe3908cfe31 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ef59e2e06f2c172b9db01405afc85c4
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.16.0 b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
index 9890ec22581b..4690a0d5c9fd 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.16.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7514fdb6dc49300e69eb520d68e09a97
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.0 b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
index b0fee54132cc..c22681858401 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.17.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5936d553d5281f9af5a07d202dbb1fdd
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.36.0 b/metadata/md5-cache/dev-ruby/capybara-3.36.0
index dfab99e6334f..da7515c05c5a 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.36.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.36.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.36.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=a6669e3b3930ea303291ed5b8de86697
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.37.1 b/metadata/md5-cache/dev-ruby/capybara-3.37.1
index 733aa3184285..8a44d4b3983d 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.37.1
+++ b/metadata/md5-cache/dev-ruby/capybara-3.37.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.37.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=dff7ddf2595e10994c372bb7ace5186d
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
index b2cf123c0eb0..eb6ed0ac37b7 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.0.0.tar.gz -> certificate_authority-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=be0ea14226b463da3de9fd4b1a1f2114
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
index 0f90421f4ccd..29acb4f7fe93 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.1.0.tar.gz -> certificate_authority-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a3d2585ca0a69fe2e224974fecbc24c8
diff --git a/metadata/md5-cache/dev-ruby/certified-1.0.0 b/metadata/md5-cache/dev-ruby/certified-1.0.0
index f37e9dbfb2f4..36c2797a7afb 100644
--- a/metadata/md5-cache/dev-ruby/certified-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certified-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/certified-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6c213d63aa1baf6e717523e6769135a1
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
index 288ea337f267..0cab6672b76a 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brianmario/charlock_holmes/archive/v0.7.7.tar.gz -> charlock_holmes-0.7.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2199c18318954dcc7ca521a25a82056e
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
index 3727bbe10eac..eb9aa3d399df 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ea4b7e7691baf405bdfe516554d834cc
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.1.0 b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
index 23782a916082..b26e928fdb88 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.1.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=46b727d0ac857fc0c310fe9735e37421
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1 b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
index 47d147dbcc26..10c61355814a 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c3e989dca5b8981f06de95d74c4d413d
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
index 0d73cedf7b9b..56a289cdc85f 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb8e407a1027438a200f5fa79bbfef1d
diff --git a/metadata/md5-cache/dev-ruby/cinch-2.3.4 b/metadata/md5-cache/dev-ruby/cinch-2.3.4
index e03bce493900..abe1047b8e65 100644
--- a/metadata/md5-cache/dev-ruby/cinch-2.3.4
+++ b/metadata/md5-cache/dev-ruby/cinch-2.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cinch-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=61484bc5941103f2c3927e13a9460347
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
index 8970d2302077..6077658369fb 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.2.0.tar.gz -> classifier-reborn-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d0b44f34e45109e87ace7ed1ef7438f8
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.2.0 b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
index 67c073a2944b..0fa2280dca86 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0fee330e349709e77ec8f16c9d84ff05
diff --git a/metadata/md5-cache/dev-ruby/climate_control-1.0.1 b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
index 96f8e15db696..853e751cf86c 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-1.0.1
+++ b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eeea2ddb73cc9e7262dc8f3344ad7776
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1 b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
index 2a9a8acdbf1e..dd79f02a659c 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaauie/cliver/archive/3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b.tar.gz -> cliver-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e748102e7c31f4fe9faed768bfa8dad6
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
index 6f0cac187eca..fd8de5316cfe 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c447a1f32e61b83f302700a8f0a4bc45
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index 66804f8e8b5b..0d025e52be81 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=480c8b0df3d3f53635db0a1f1caa03b2
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
index a2053c36b9d5..315ac70cf258 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4494e3f5fd666bfd58272c428b6e7721
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
index ada93d020664..c3c0d9650ea5 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=731ed83b9e426789cef9427d5dc35690
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1 b/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
index 05f7024790df..115b5debeda3 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coercible-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a2035b78fafe7e0d816164f4fba1c23e
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.1 b/metadata/md5-cache/dev-ruby/coercible-1.0.1
index 20b52800a4fb..35c5e665229b 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.1
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/solnic/coercible/archive/c076869838531abb5783280da108aa3cbddbd61a.tar.gz -> coercible-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eab2cae415ae8076b6d1aafb5431e940
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
index 84faf2bbf688..f26b040053b4 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/coffee-rails/archive/v5.0.0.tar.gz -> coffee-rails-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a2262fc95178fd5dcfb74c6e0eebed93
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index ac61df2c9365..7b06036f474f 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8cfaa006a1c99a6ed16c66b10eedaed6
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
index 27e3465234f9..1ae59c73ffaa 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=90246645fba1f4db4bb2817085405f6d
diff --git a/metadata/md5-cache/dev-ruby/color-1.8-r1 b/metadata/md5-cache/dev-ruby/color-1.8-r1
index 1bdfe9c5c51d..049684202150 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8-r1
+++ b/metadata/md5-cache/dev-ruby/color-1.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b9f603efb5b215b2df6a6b267113f32
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1 b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
index 9fa55ab90c42..48fe16f85030 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=42264c41990d051fa9a514e0eff6d20b
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2-r1 b/metadata/md5-cache/dev-ruby/colored-1.2-r1
index 12c9fb1214ac..59a52c58f127 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2-r1
+++ b/metadata/md5-cache/dev-ruby/colored-1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored-1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=738a0c302ca27b558c3a9b4bb419a256
diff --git a/metadata/md5-cache/dev-ruby/colored2-3.1.2 b/metadata/md5-cache/dev-ruby/colored2-3.1.2
index 737cff3cbb6e..17417cf875a6 100644
--- a/metadata/md5-cache/dev-ruby/colored2-3.1.2
+++ b/metadata/md5-cache/dev-ruby/colored2-3.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored2-3.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4175a3eb75b79143c54cbb0e0a207989
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
index 59043e447deb..f037f93ffd90 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colorize-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e2e4f8dc68b6731ce93ed24c0832b82d
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 3c2fa3a34878..47f302c88692 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/columnize-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=69ee296083f774d028221dd3624a4dd2
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.6 b/metadata/md5-cache/dev-ruby/combustion-1.3.6
index f35b608671fe..75278ed4afbf 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.6
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=78ce9605e02e172c6b1c81909f438702
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.7 b/metadata/md5-cache/dev-ruby/combustion-1.3.7
index 45ce8de7b96f..48d9e748a952 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.7
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=78ce9605e02e172c6b1c81909f438702
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0 b/metadata/md5-cache/dev-ruby/commander-4.6.0
index 30358c2f4e2e..543eaa1daaa3 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.6.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1bf8a557374f0c2eb858b33599e2311c
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
index 889136c2b6fe..e703d601bd4f 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.10.tar.gz -> concurrent-ruby-1.1.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1685e84ac91d7947cf7b992b398fe408
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
index 05031f1d0d14..f92a4cb87a70 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.9.tar.gz -> concurrent-ruby-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d15a525f2f98a3066fbdd509d4e0c884
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
index 1b138a59970b..c74760f86702 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cc890b893baa337d3587e831ff8937c8
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.1 b/metadata/md5-cache/dev-ruby/contracts-0.16.1
index ab946968a05f..f1ad40f444dc 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.1
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=402d905d05eb92b6379c2a7580ff7297
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.17 b/metadata/md5-cache/dev-ruby/contracts-0.17
index 13a6c6d18f7a..d64c64f3ca2a 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.17
+++ b/metadata/md5-cache/dev-ruby/contracts-0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.17
 SRC_URI=https://rubygems.org/gems/contracts-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=53352203f274dba26524bc3fc9dbf5e9
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
index 9959585f487e..61da58d2e52a 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a8c00efa9c5b2d6f22e2c71b3e5eeace
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
index 171fa087cce2..33ed54036abb 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/countdownlatch-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c8ce543f58f943c4988f90a26fd04e29
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4 b/metadata/md5-cache/dev-ruby/crack-0.4.4
index bec9375bcd3e..b6b1e45decd8 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=181ae215e9ec70555f1ee74051a77bf4
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6 b/metadata/md5-cache/dev-ruby/crass-1.0.6
index df48ab04b098..b00e78f47fb7 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e282adb0525d5791b829a83ceb7a9730
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1 b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
index f9e478ed5b89..688847b347e7 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e88a9abcee2d9ab06811baeb691f092d
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1 b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
index 9c50d3f17bdb..57fd8dd0e51d 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a8bedce6efa810c8f71418a762893dd1
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11 b/metadata/md5-cache/dev-ruby/cri-2.15.11
index ad82528fa855..88a27c8f4bfb 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.11
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5883b85ef1c62a9ecfa83dfda164b0c6
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11-r1 b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
index a2652d3a5a96..c736613f1d30 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7d39d862fd5d9ca71d4f06095ca4620
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.10.0 b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
index b2cab3d5fbdd..e6e851240cca 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.10.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.10.0.tar.gz -> css_parser-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a27a693fc987f6290f83b19104261a5e
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.11.0 b/metadata/md5-cache/dev-ruby/css_parser-1.11.0
index 17c6c2365c43..0c5f90cb9989 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.11.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.11.0.tar.gz -> css_parser-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a27a693fc987f6290f83b19104261a5e
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.9.0 b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
index 51907f06ade5..7cf31124910e 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.9.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.9.0.tar.gz -> css_parser-1.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=28bc29f803016e341023e018e4873d36
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.2 b/metadata/md5-cache/dev-ruby/csv-3.2.2
index c9114cb5c451..d745cdb27e1a 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.2
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.2.tar.gz -> csv-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=382e12238713bd759a34eedcff011c9e
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.3 b/metadata/md5-cache/dev-ruby/csv-3.2.3
index d6a4eb74aeb7..884792f34de6 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.3
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.3.tar.gz -> csv-3.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e34c1af33d2bcc500e048c95fecd406
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1 b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
index 339cb991eb06..386500efad7b 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9921c5b018842e9b933c9c5af1c1fc18
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.1 b/metadata/md5-cache/dev-ruby/curb-1.0.1
index 06b701998169..92b289f3ca8a 100644
--- a/metadata/md5-cache/dev-ruby/curb-1.0.1
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e882c3e86321650c6c4115de03f26699
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.2 b/metadata/md5-cache/dev-ruby/curses-1.4.2
index 8eb0d5864592..80d08ece2d35 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d9c505637f0b380b57557d6f7de89e3c
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.3 b/metadata/md5-cache/dev-ruby/curses-1.4.3
index e3662faaa71c..805651ebf0f8 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.3
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3dd00288330f9f20d37056f18948d919
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.4 b/metadata/md5-cache/dev-ruby/curses-1.4.4
index cefa4838a7ac..fa446e377154 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.4
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=537df034a926b749f56c9e99e3ef999a
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
index 0969a1eb726c..ca64a642f6d8 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/daemon_controller-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bce736046883a0af1be10c0b626f82a9
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
index 1a15d32a5dbf..59c1020dd1db 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9fdc7239f69e4108f1a153f607c9645b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.0 b/metadata/md5-cache/dev-ruby/daemons-1.4.0
index efc64203617c..8f7441a2e772 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.0
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.0.tar.gz -> daemons-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7d3f9a57569fe967ee35d4ec8363ba18
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.1 b/metadata/md5-cache/dev-ruby/daemons-1.4.1
index a9fa85aefcbc..d5ef3f59344f 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.1.tar.gz -> daemons-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed89f1ce280d318ea89a14abc1fd1fe1
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.11 b/metadata/md5-cache/dev-ruby/dalli-2.7.11
index f2e081710b2c..71e6feaab877 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.11
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.11.tar.gz -> dalli-2.7.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f9e895b7d1a219527a8c9222bc63100c
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.0.3 b/metadata/md5-cache/dev-ruby/dalli-3.0.3
index 299bd2242a9b..f57f6d7890ee 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.0.3
+++ b/metadata/md5-cache/dev-ruby/dalli-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.0.3.tar.gz -> dalli-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a4c7fc8ae80ea6941131a27a4ef6bac6
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.1 b/metadata/md5-cache/dev-ruby/dalli-3.2.1
index 4a0b24004527..9e5f854e3bdb 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.1
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.1.tar.gz -> dalli-3.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d376f2c166657f8a1b16ef387db36ba4
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.2 b/metadata/md5-cache/dev-ruby/dalli-3.2.2
index 976e08f30c1e..84c05a0f407a 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.2
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.2.tar.gz -> dalli-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d376f2c166657f8a1b16ef387db36ba4
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
index 2c059b30869c..6b4d35c1a353 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d48ca7bb15aae4dd66f9b59e09e80a37
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
index 74bf39e4490b..281f7f1af1e7 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4a466b4223fa737c953bf3ed93155b8
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
index b774eb17f0c5..79ac190691f4 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-active_record-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b8fa766f4ce9304d0b9f7773f82072c6
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
index c07ae5b398da..796d3d6c4cc7 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-core-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19314e48f0b3667f4c731434508a0a72
diff --git a/metadata/md5-cache/dev-ruby/date-3.2.2 b/metadata/md5-cache/dev-ruby/date-3.2.2
index 66c83795194b..2a5255f0a1c7 100644
--- a/metadata/md5-cache/dev-ruby/date-3.2.2
+++ b/metadata/md5-cache/dev-ruby/date-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.2.2.tar.gz -> date-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f0d430d7ebe5f5256c7b8d2e604e5139
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.11.0 b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
index 82500d63cf74..5a912dbce8a4 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.11.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=68cba8c4fd461444138d70599abde451
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.12.0 b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
index f9839ffd0bbe..ef4d164e2bcc 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.12.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f82f941509399776334be34a422b4c11
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.3 b/metadata/md5-cache/dev-ruby/dbf-4.1.3
index 5cb1a34cb84e..078b5205bcff 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.3
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=080ae00d4914a2acca9d9fcfac739908
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.6 b/metadata/md5-cache/dev-ruby/dbf-4.1.6
index 5133693eb61d..26cd15ce1bc8 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.6
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=48ddc4c7a70cb7627bf350b6ca20a219
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.0 b/metadata/md5-cache/dev-ruby/dbf-4.2.0
index d9ec0bae7947..a44eec2d636d 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.0
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e9ad504eb45c4dfd74fdbf0a17f9de45
diff --git a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
index ee1b2e1b1f0a..5c627dbe44d9 100644
--- a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmemoize-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=80879e9b0e522109b2904240db722659
diff --git a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
index 7c5e2f30ed38..0d8a0b5f0bcd 100644
--- a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmetrics-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8eaad5d3848a7bcc04efd3f50e055646
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
index 2e371865f85c..d98ff1fb3fac 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a31d24ca92a3a4d7fbc0958fbd442b66
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
index 09527931b15d..0cbbbf5ede23 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.1.0.tar.gz -> debug_inspector-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b3fde1e79e5adca0cdf1dd8ef896d244
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index bd87a0dd5e86..6b71bf85c8fc 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d8271629af08a5304a79ba8c44953e5
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
index c959a60cc35b..281fae8322cd 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8fa3c06658e1ba543c0df3c8bc6f5c19
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.1 b/metadata/md5-cache/dev-ruby/delayer-1.2.1
index ac6a5ce21814..8d0504b3d153 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.1
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cef54d2a66ee55c0867f492b7eea9ca6
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
index f835afde8d90..78db62df3631 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/delayer-deferred-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ee6ca550afd1a5ff64191ef1f8ce8c9b
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
index f5a15fe3dae2..c028c60e0885 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b5347dce55e409a1aaef07ae3ba20a69
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
index 4e90b68883d2..594184bece1e 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/deprecated-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1fcda73caa7fd3007b1b1eb5f600fe85
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
index d3dfb4283ae1..01e1dd123aa4 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/descendants_tracker-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ede7c969368ebbd63fb4bb1874cd9fdc
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
index 9914e752408c..fb30f75e40af 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7edf2a7b0bc9892b662ce4d5a7cf5a38
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
index f890e708f13d..667336ab6cf3 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e6c91511500f95d5fa082a9af47e450
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
index b4af9b6ccf35..c20f10605cc4 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=713b06812944779ddd5f21aed9ddf91b
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
index 9473a6fb517a..ea6b38be257d 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9aaa6a6f33a81959b1a66cca1f98ac90
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0 b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
index 4590837e7112..67c74bc4fb4e 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5e1e562ac046d8c19765f7de6204984a
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.0 b/metadata/md5-cache/dev-ruby/digest-3.1.0
index 6d6640f62688..35ed588a25e2 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.0
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.0.tar.gz -> digest-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0502147edc2792e239f559b2308e29ea
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.0-r1 b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
index 1a5b49ab5537..568007211896 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.0.tar.gz -> digest-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5f1dd1dba2c8608f26a9d1b13b5f6a52
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2 b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
index c6f88939d74a..9dd5e02296b5 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.0.2.tar.gz -> diva-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=91a34befa138a9b727e75cbfd31e20de
diff --git a/metadata/md5-cache/dev-ruby/diva-1.1.0 b/metadata/md5-cache/dev-ruby/diva-1.1.0
index 55a5c2d65158..31b0f32fd8b1 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.1.0
+++ b/metadata/md5-cache/dev-ruby/diva-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.1.0.tar.gz -> diva-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8dd814b29a0afeeb8b7a64df9fee908d
diff --git a/metadata/md5-cache/dev-ruby/diva-1.1.1 b/metadata/md5-cache/dev-ruby/diva-1.1.1
index 5abe1513a200..79a8ef041ff3 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.1.1
+++ b/metadata/md5-cache/dev-ruby/diva-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.1.1.tar.gz -> diva-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a30ce19df47e68e9bcc6b0c98283dbd4
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.9 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
index d0888bcc4e50..108a449560ec 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dnsruby-1.61.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb36de8ba809bb526550bcb9bed03e5d
diff --git a/metadata/md5-cache/dev-ruby/docile-1.3.5 b/metadata/md5-cache/dev-ruby/docile-1.3.5
index 1c32d6dc5c35..2161e064ea9c 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.3.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.3.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.3.5.tar.gz -> docile-1.3.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2bac9ff3f31ed63678a18338b541a49d
diff --git a/metadata/md5-cache/dev-ruby/docile-1.4.0 b/metadata/md5-cache/dev-ruby/docile-1.4.0
index 4d77e3d6fbc3..e72baa620fa4 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.4.0
+++ b/metadata/md5-cache/dev-ruby/docile-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.4.0.tar.gz -> docile-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70bba113aea5072345e3e5e44c269f56
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index 968e7c5f270b..b7338babdb92 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d4ef465a1e91012a4d866f24f903e6d
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
index 124d7261fc39..ba426fb0cf15 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ab9c15c3a357d85de05df03a620c34ee
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.7.6 b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
index a5bdf16683f5..354b96aedcef 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.7.6.tar.gz -> dotenv-2.7.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b17b66ce54a1d774e2a47e8a9fe83d9
diff --git a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3 b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
index d0138c16b07c..5cd339236cc9 100644
--- a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/judofyr/duktape.rb/archive/v2.3.0.0.tar.gz -> duktape-rb-2.3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5a78c25017189c1e825a82baaa7951c8
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r3 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
index 2b3fee8a9137..13e3286eac46 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dust-0.1.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dba29e2bdcb10c1f1a43734c376a1a74
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
index 7c5a1d42abfb..953e7955e9b7 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e15884d77ad9206ccc6e481ce5fb7d21
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
index b0a161f65254..3f3802f2716c 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=575acdfb003ccda8ce6aebe0c36ba630
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.3.0 b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
index 5f94b852e951..f3fd1dba276a 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.3.0
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.3.0.tar.gz -> ed25519-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=62b48d59314af931d1d4ac53d9f273c9
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
index b26bc9e2bfbb..11eaf6405e02 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cf858fde80a3a04cceff394e7a76a8a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
index 1db428e001ed..60f1b7134af0 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=90c6ade4733600429ca71fca4f7af429
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
index 6a171a4b6561..c79271381fc6 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=494cea2922d3dd0eedc82f89313ff677
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
index ba6fe8d372aa..371e135d2531 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8001f37db8a126bf4e461a591b05abd5
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33 b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
index 3909d0398a18..95aff2ad853e 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v0.0.33.tar.gz -> elasticsearch-ruby-0.0.33.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f86323843b07077b6a69f5e4ab73ec96
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
index 9962e716f28d..039ebcb5a69f 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15babb90f9d2e9c1689c3963ffb84fab
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
index ccec862b0f0f..537b85158404 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c5c4041ee305ef0832d06472a3a1374a
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
index 9dfc09225a0f..62520c6fcb9e 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.2.tar.gz -> em-websocket-0.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=814ff0279a62ddd81155e0af67277668
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.3 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
index 72fe2dfebc76..7bfb4a9815ae 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.3.tar.gz -> em-websocket-0.5.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ce9e4717a91bf26daa1c4cb8077159b0
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
index a92895e019ed..36738b6a0b94 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=03eacd808b8ff2aed106e0f0ac82de1a
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.7.0 b/metadata/md5-cache/dev-ruby/equatable-0.7.0
index 361b158c9a11..30634d0a55e8 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.7.0
+++ b/metadata/md5-cache/dev-ruby/equatable-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/equatable/archive/v0.7.0.tar.gz -> equatable-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2f83bbf6c3c9a59c4ee04b9845a85c7a
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1 b/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
index 584ec7c5f12f..d9d6cb60552a 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf928701fe4c6d55d30970ed08cbefe9
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
index a0aa656f7335..cd45a9df59a3 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=34fb868e78986552a24718636b37f733
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
index cc2be7cc0c7f..76f73cb62d21 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5c97ed461ef047a868716e45b4067c3a
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.14.0 b/metadata/md5-cache/dev-ruby/ethon-0.14.0
index 2e4a7ab83dd9..2a9d87dfc681 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.14.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=afb5ed0f7549b6f42e60055f89fd2f56
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.15.0 b/metadata/md5-cache/dev-ruby/ethon-0.15.0
index 672be41bfaff..3763a3928b53 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.15.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bdfb1581adffbcdd8ce36c380f76b0b3
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
index 446b66d13996..2b65dfc18717 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/evented-spec-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=13b2ccfbce0976da877b1fe63201ca97
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
index fee9137c5ebf..0fa86c0949f5 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ruby/eventmachine/eventmachine-1.2.7-openssl-patches.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9e4d90f4fa22dbead1f2d5f782bd23dd
diff --git a/metadata/md5-cache/dev-ruby/excon-0.92.3 b/metadata/md5-cache/dev-ruby/excon-0.92.3
index 9b238fc2a7c4..5ef08afdfb8e 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.92.3
+++ b/metadata/md5-cache/dev-ruby/excon-0.92.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/excon/excon/archive/v0.92.3.tar.gz -> excon-0.92.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=41eb16597fe0fc6597ca4e6a022774e0
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1
index 49454e58ffac..7e4faba94b67 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19330c990ef3dddcf0c0b2ff3216fada
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.8 b/metadata/md5-cache/dev-ruby/exifr-1.3.8
index b2d58145f745..07e006a16c3f 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.8
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.8.tar.gz -> exifr-1.3.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.9 b/metadata/md5-cache/dev-ruby/exifr-1.3.9
index c391740ef8ef..e245dfbf261e 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.9
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.9.tar.gz -> exifr-1.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.23 b/metadata/md5-cache/dev-ruby/facter-3.14.23
index b364e6b4405f..5e9683d92b0e 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.23
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.23
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.23.tar.gz -> facter-3.14.23.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dfc76c2f3f95e3c2b5680e396d1b0fa7
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.3 b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
index e65a2910b305..298d6b885985 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.3.tar.gz -> fakefs-1.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b478919c26197a0becf3e27c7a61a84
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.3.2 b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
index 6a2e23e6cbce..7b1e5f205be4 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.3.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.3.2.tar.gz -> fakefs-1.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ef72c9f7969a91eba4287553c774de51
diff --git a/metadata/md5-cache/dev-ruby/faker-2.19.0 b/metadata/md5-cache/dev-ruby/faker-2.19.0
index 942438c58fc4..7020f34e7f7d 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.19.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.19.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.19.0.tar.gz -> faker-2.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ddb41ebf41b0188c591c0fd30c13b0a
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.17.3 b/metadata/md5-cache/dev-ruby/faraday-0.17.3
index 1aa99aaa87aa..c855a8e0c2a1 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.17.3
+++ b/metadata/md5-cache/dev-ruby/faraday-0.17.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.17.3.tar.gz -> faraday-0.17.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3761d51ab1e70a1413da2be8fd3493ef
diff --git a/metadata/md5-cache/dev-ruby/faraday-1.2.0 b/metadata/md5-cache/dev-ruby/faraday-1.2.0
index 46a355909e87..2af3c51418a3 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.2.0
+++ b/metadata/md5-cache/dev-ruby/faraday-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.2.0.tar.gz -> faraday-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7b42fbbfba211e254524964a7305d695
diff --git a/metadata/md5-cache/dev-ruby/faraday-1.3.1 b/metadata/md5-cache/dev-ruby/faraday-1.3.1
index 7c507e03a563..8eca3221692a 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.3.1
+++ b/metadata/md5-cache/dev-ruby/faraday-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.3.1.tar.gz -> faraday-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eed556b98eb3963bda362a0376a2760e
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.3.0 b/metadata/md5-cache/dev-ruby/faraday-2.3.0
index 4550d5f8d0fc..c86e9ae3aeb3 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.3.0
+++ b/metadata/md5-cache/dev-ruby/faraday-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.3.0.tar.gz -> faraday-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c5c1c5a6fb4de92540cc0102fc9677c
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1 b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
index 30d2f465deda..43a355cb926e 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v1.0.1.tar.gz -> faraday-net_http-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dea6fa89e0452064e0370b2b7774216b
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3 b/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
index ca4b161fbea2..3a4e68d0bc81 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v2.0.3.tar.gz -> faraday-net_http-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dea6fa89e0452064e0370b2b7774216b
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
index d9a9c03319b7..a9acb9f768c5 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.14.0.tar.gz -> faraday_middleware-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15dedaf40c188fa5c806ac8f0cb1c599
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
index c051dd9cc7f8..bb59375a772d 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.0.0.tar.gz -> faraday_middleware-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ee10dd012dab7900a13b91d8d576c810
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
index 3e34434fa9ec..628ca86a2414 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.1.0.tar.gz -> faraday_middleware-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d6d3f2322501f045957ab60296acf2b
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
index d497dcf377cd..78579c0a8181 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.2.0.tar.gz -> faraday_middleware-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5588a1fec1e9e6a4a15ceeccaea25daf
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
index 50cee873883c..008b609e996f 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=712557625ce91aa282d69fc45cd3c062
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
index c1709f1c248e..833a755f6cec 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7d3ef4d0dffdade42c23b27c4cc96089
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
index 039896f618ab..f413fdc196fe 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=57a8c20dd5e147e8cdb23e2350612fe8
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
index 1e5e9a7ee253..26ed975c1e1d 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.8.0.tar.gz -> fast_gettext-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4679d1cb37250770c154a47f5564bb17
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
index 13555770effd..10b8d5d19946 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.8.0.tar.gz -> fast_gettext-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf0d63938cc4e5a1b8e87cd3241522a9
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
index c55167a94244..f12a2be15d4d 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.2.0.tar.gz -> fast_gettext-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=94b9fc2ff94cd86dceb575f9d17e9d58
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
index 41721f75307f..f4490ff129d0 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=03b636dd419ee711b5d36ec5694711e4
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0 b/metadata/md5-cache/dev-ruby/fattr-2.4.0
index 47b5ca574c7b..0303043e5d04 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f377f598b40dbe738be4baf16093dc07
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1 b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
index 144f9725e80c..64b9ad684d66 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d92fd48c0054778098a0cbbf5b471c13
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
index 19282ff6b644..1fdec519afad 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1b41983c644be0e81bc86e72f1736543
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1
index 17d195910a88..fe24e10b5930 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ferret-0.11.8.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=171a23c0389fd8012084bc8894abb526
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.20.0 b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
index 6573b9790f77..30ad4b6409c4 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.20.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.20.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0dbb345876586e8bf39ca63c05980d3c
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.21.0 b/metadata/md5-cache/dev-ruby/ffaker-2.21.0
index 1f8561190c28..c0bc260dc292 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.21.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bfb706d8486a84b82658273613ec4c42
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1 b/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
index 92951f421299..0686baf9cd3a 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.14.2.tar.gz -> ffi-git-1.14.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0ca56685a78b63369c6c54615dd71c21
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.5 b/metadata/md5-cache/dev-ruby/ffi-1.15.5
index 6b448b0fc8a5..75c69f76aeef 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.5
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=de65d9cb7572d5714f8033801edaa47b
diff --git a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
index 6627cdeb3613..a29c42b6f405 100644
--- a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffi-compiler-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6a600951e457ccd6b34c056457e67e64
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
index dd65e4eacfa1..3df69f070143 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/file-tail-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=62afc87434cba663cb929fead0275104
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0 b/metadata/md5-cache/dev-ruby/filesize-0.2.0
index 069a0efb9fb5..494d7b4ed4e2 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.2.0
 SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0eb7537b5a59abdca88f4acf024ade0d
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1 b/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
index 2a493e7cc901..ecfb0c44b0ee 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.2.0
 SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6091c0882185999c1fc01081cd4ad221
diff --git a/metadata/md5-cache/dev-ruby/filigree-0.4.1 b/metadata/md5-cache/dev-ruby/filigree-0.4.1
index 01f1da106003..96bb5c7e3a78 100644
--- a/metadata/md5-cache/dev-ruby/filigree-0.4.1
+++ b/metadata/md5-cache/dev-ruby/filigree-0.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/filigree-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3390ebc212220e198dc41e7c8e599a09
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.7 b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
index f989011e8929..928dea46cbe4 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.7
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fivemat-1.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=509c0fcb29819cac1fb98d615ed1e729
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1 b/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
index a622ff5a0245..c89f5ddd06f1 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.6.tar.gz -> flexmock-2.3.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9b1c046d11f7162d2add36a2cc61a953
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.10 b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
index 45981c3416a6..714bca2e1f78 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.10
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flickraw-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf8d75c6dbb49f4bdf7eea0241aec3d2
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.4 b/metadata/md5-cache/dev-ruby/flog-4.6.4
index 4256e133eb8f..d820fde781d5 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.4
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7b7dd6a5f47b62118e2fcb51ae55b3d
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.5 b/metadata/md5-cache/dev-ruby/flog-4.6.5
index 21da798d5d7e..b089269a4f7b 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.5
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8055c9d79aa0c03a06ce872996d5b563
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.6 b/metadata/md5-cache/dev-ruby/flog-4.6.6
index 979a95cb1bbe..bf081a9340e2 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.6
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8055c9d79aa0c03a06ce872996d5b563
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
index 1fe6f3f4b61c..c4072dfdc683 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8e53dafa94ea69bf60185ce63b1b2518
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.8.1 b/metadata/md5-cache/dev-ruby/forgery-0.8.1
index 0a33dc435658..b5f219165a8e 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.8.1
+++ b/metadata/md5-cache/dev-ruby/forgery-0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/forgery-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f26a7493b4b636fbc37bdf1da124b181
diff --git a/metadata/md5-cache/dev-ruby/forwardable-1.3.2 b/metadata/md5-cache/dev-ruby/forwardable-1.3.2
index 796170fd5387..b6c46d8f4cf1 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-1.3.2
+++ b/metadata/md5-cache/dev-ruby/forwardable-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/forwardable/archive/v1.3.2.tar.gz -> forwardable-1.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ff428970cab1b2121a9f3c3002b6414b
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
index 127993b11f40..3a7a856b7a3b 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b0b8900f31ccda2f395d248ddf5ff12
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
index 0f000b121ef2..0707d5a8346e 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.0.tar.gz -> fuubar-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8288528bf6168ce97e8bad4645f4a7aa
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index 43372493f15e..3a9a6d951c5e 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3e90a422b53c98cd93fec49170c20c7
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2 b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
index f365d404afaa..e5cda856ff5e 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.34.tar.gz -> gettext-setup-0.34.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b874490fd0579c00bcf65fe0b29e5532
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
index b09597e33b1a..9c54f6e5e5ab 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.1.tar.gz -> gettext_i18n_rails-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=165b0b43bad1f4a7de779d3ff65cc6f3
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
index 20bf6a7f8f69..c8b5a55e22c6 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d20710d26d509542348079efe03ba5d1
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.1.0 b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
index 9fefa0120d9e..7d2f26a23939 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-5.1.0
+++ b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/gherkin-5.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aff42f87036d8fc9e77e99f5fed5f0da
diff --git a/metadata/md5-cache/dev-ruby/gist-6.0.0 b/metadata/md5-cache/dev-ruby/gist-6.0.0
index b584d490f86f..9c878554ad38 100644
--- a/metadata/md5-cache/dev-ruby/gist-6.0.0
+++ b/metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gist-6.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4c8afb9170e03c00953885662feabf91
diff --git a/metadata/md5-cache/dev-ruby/git-1.10.2 b/metadata/md5-cache/dev-ruby/git-1.10.2
index 7ed0cd410a32..621979392a90 100644
--- a/metadata/md5-cache/dev-ruby/git-1.10.2
+++ b/metadata/md5-cache/dev-ruby/git-1.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.10.2.tar.gz -> git-1.10.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4de49bddcb7e4f0345a88780c5bbaca8
diff --git a/metadata/md5-cache/dev-ruby/git-1.11.0 b/metadata/md5-cache/dev-ruby/git-1.11.0
index 9d1fb0443980..0ceb307f95f3 100644
--- a/metadata/md5-cache/dev-ruby/git-1.11.0
+++ b/metadata/md5-cache/dev-ruby/git-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.11.0.tar.gz -> git-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=72bebc00f79bf1a881cf045e0b82adc9
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.6.0 b/metadata/md5-cache/dev-ruby/globalid-0.6.0
index c12d6fa6c265..acb5dad91f3c 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.6.0
+++ b/metadata/md5-cache/dev-ruby/globalid-0.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.6.0.tar.gz -> globalid-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=acc1b5e3a0b07f00cfc2ea8edffc4366
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.0.0 b/metadata/md5-cache/dev-ruby/globalid-1.0.0
index dd42a42d3d5f..48893373d5b6 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.0.0
+++ b/metadata/md5-cache/dev-ruby/globalid-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.0.0.tar.gz -> globalid-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=acc1b5e3a0b07f00cfc2ea8edffc4366
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1 b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
index a313689f4cbe..f5378c64659c 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.0.0.tar.gz -> globalid-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=81abe5f1065825b61b5ddf744881eecc
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
index 166a74a9167f..38da998489b3 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gnuplot-2.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1285709d12d1f5222a27f2d9169848ff
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
index 6fbed1c91518..8f723fe813e4 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> google-protobuf-3.14.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f495d8b4807204618d2a02873b95d8b8
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3 b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
index 1a3154c5a23b..b0f5d6952db6 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> google-protobuf-3.19.3-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=55f5a5c5f165b76682228f3baf7243ca
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3 b/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
index d598716c3e8c..c8de2d21c25e 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.20.tar.gz -> ruby-gpgme-2.0.20.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9c7dd5bc1badcfcef8a67597a6edd3d0
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.14.0 b/metadata/md5-cache/dev-ruby/gruff-0.14.0
index f63631add868..41c480ed623c 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.14.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.14.0.tar.gz -> gruff-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=05fda139f6ce51876d62390649023847
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.15.0 b/metadata/md5-cache/dev-ruby/gruff-0.15.0
index 71812489fd66..e1863a9f7481 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.15.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.15.0.tar.gz -> gruff-0.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb2c6600668711d598175896f15e9864
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.16.0 b/metadata/md5-cache/dev-ruby/gruff-0.16.0
index 811597cc3db1..9c22db9e29e9 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.16.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.16.0.tar.gz -> gruff-0.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb2c6600668711d598175896f15e9864
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.17.0 b/metadata/md5-cache/dev-ruby/gruff-0.17.0
index b8a954eab757..c5e3ecf76d8e 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.17.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.17.0.tar.gz -> gruff-0.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb2c6600668711d598175896f15e9864
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.18.0 b/metadata/md5-cache/dev-ruby/gruff-0.18.0
index 3839e26eaea2..1f9a0a368819 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.18.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.18.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.18.0.tar.gz -> gruff-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb2c6600668711d598175896f15e9864
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.2 b/metadata/md5-cache/dev-ruby/haml-5.2.2
index 648aeb350e9c..907f13d63501 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.2.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.2.2.tar.gz -> haml-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5681d8a33f55c1b7a6c9ba89908037d4
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
index 9c79eed5c849..b881b4d92dd8 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c2e3b092acd0eb86fef6e5ced378ce10
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
index 6b838160c620..0667b7653f4f 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70b8723dfce8bd3d56e00370762a5146
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
index 3313e38c90f1..cbe900ca719b 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hamster-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=47cbfdf6c5ea2371af6a9352bbe52529
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1 b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
index 4dad5ce89ef8..cf3a8c8043b0 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
+++ b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashdiff-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7d17d757ab96e74fd7ced3ca1b52a81
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
index 959ac69fdad3..4b9346076ec4 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashery-2.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7073bc80b9c44882d34fa5c860d14269
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
index feedf9f11cbf..747bfeb76b4e 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d7f13eb2465ba7a3b6ccbc0fbb2eff9
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.6.0 b/metadata/md5-cache/dev-ruby/hashie-3.6.0
index a4c8fd171e70..053c4618c1fb 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hashie-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/hashie-3.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dad64ab32a92fd91ed5a7e46983f0d44
diff --git a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1 b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
index b31ef3f33aa7..fef8a61b30fd 100644
--- a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/intridea/hashie/archive/v4.1.0.tar.gz -> hashie-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7b10063964693285d28cde8f61d12143
diff --git a/metadata/md5-cache/dev-ruby/hashie-5.0.0 b/metadata/md5-cache/dev-ruby/hashie-5.0.0
index 7e000071256f..138cfe21a52a 100644
--- a/metadata/md5-cache/dev-ruby/hashie-5.0.0
+++ b/metadata/md5-cache/dev-ruby/hashie-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/intridea/hashie/archive/v5.0.0.tar.gz -> hashie-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cf353dcde0f6ee1ca06e7be4631cf0c
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
index 464ef41a90a4..c44761dd17d6 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashr-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a058bff25ce2c6774f8c72a0c111ac43
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
index dd80db489b79..3e0a96b54bf8 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=331d9eb7b9df38da10ba57ab63a5b1ab
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.8.0 b/metadata/md5-cache/dev-ruby/hiera-3.8.0
index 2913f9a65c92..0fd0eb0710c0 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.8.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27e02dcb24471742dfa9db8b6ea6adb0
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.9.0 b/metadata/md5-cache/dev-ruby/hiera-3.9.0
index 8910df2af31f..e60d80159b7d 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.9.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27e02dcb24471742dfa9db8b6ea6adb0
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
index d94ec5ee6d5d..4bb702f811ee 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1d1b86102a0d03737bb006149edb610c
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
index 2087d156c8fc..01e3603acc86 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.2.2.tar.gz -> hiera-eyaml-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad3c14b280e4dfc8078b8cbf42405bb8
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
index e64077d7c3ea..24e9673b341f 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-gpg-0.7.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=96bac9d74e0c46558ca895ca9722023b
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
index 991c68632f5d..c6b69505955d 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a145e69c63155c734c9dbc80ce555c01
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index 88fc2786b263..20b1518bd61b 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc4ba5496eabdc9ae1e140a52f5d2e10
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3-r1 b/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
index bc4d0c36f312..cab59f53bb73 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f7dc72c8b276aecb7cedbb0e55cce6c
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 28bac25bb527..d7c6f6da4b79 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=89fdc656c756246e03ce9f424dd3b054
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
index 2655167cf151..4e2f39c5554c 100644
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=be8c47a3de392ae330a06d4b83421479
diff --git a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1 b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
index 8ad0a1311055..f15475b97276 100644
--- a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
+++ b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/histogram-0.2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=addc6f09d26fb1d75f064a937132f60a
diff --git a/metadata/md5-cache/dev-ruby/hitimes-2.0.0 b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
index bc08f4c93289..86a27e1acf0e 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hitimes-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1490cf35f4933085e182d815cef7dc4f
diff --git a/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1 b/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
index 3ef64d232bed..0b4092d40b77 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hitimes-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50665dfeccbd6626e1bccb3c0063a103
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1
index 45af0691b216..0280f1cb0a27 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=433e52181c665d2c1c549d13a61660cd
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
index cf1299d3be65..4f82420e8f9b 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4db7e052f0535e995b998ac030634df3
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index 1f58d1ad7e7e..d328fc35b72f 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8c7bea2c5d9bcb94785e01c0a53c47f
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.23.1 b/metadata/md5-cache/dev-ruby/hoe-3.23.1
index 4884acdc6add..082edc8bdcc1 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.23.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.23.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.23.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1a051944963b548cba57fb0a9d5f6a49
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.24.0 b/metadata/md5-cache/dev-ruby/hoe-3.24.0
new file mode 100644
index 000000000000..d5b890c9c37f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hoe-3.24.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] <dev-ruby/rake-15.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Hoe extends rake to provide full project automation
+EAPI=8
+HOMEPAGE=https://www.zenspider.com/projects/hoe.html
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] <dev-ruby/rake-15.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) 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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hoe-3.24.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1a051944963b548cba57fb0a9d5f6a49
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
index bcd57ca65f4b..85f89bbf4567 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c8e2e76c15c05daf33656458a921f4a8
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
index 3856625120e4..c4807c6de43a 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6089907745ea644e38443a0798bb3e5f
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
index 3eff1496609a..71280b2f54f5 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/htmlentities-4.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=990c3142cd061198241d7b208b09b8be
diff --git a/metadata/md5-cache/dev-ruby/http-4.1.1 b/metadata/md5-cache/dev-ruby/http-4.1.1
index 8750a0e36cd9..f17e1dc9306f 100644
--- a/metadata/md5-cache/dev-ruby/http-4.1.1
+++ b/metadata/md5-cache/dev-ruby/http-4.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ca1207ca6dea6cfd88ee2045e832ff81
diff --git a/metadata/md5-cache/dev-ruby/http-4.4.1 b/metadata/md5-cache/dev-ruby/http-4.4.1
index f90db98c4441..c2a56a44df32 100644
--- a/metadata/md5-cache/dev-ruby/http-4.4.1
+++ b/metadata/md5-cache/dev-ruby/http-4.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7e13c89db8792ddd970e4e906efa9af2
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
index 2a84c4b236e3..fee66c83f8c1 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=53c438d9e3aa8d4b3d354203ead33238
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
index 73d9f2021157..a7912d63de39 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=414f4a785a5e46d31dba14a034f0cfe0
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
index 2146e015c70c..177c2616f1ca 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44d4d671fb6d2b43941bd438e7ac1405
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
index a062b5d725bb..32c6898e4ef7 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5bf2691d98ac26b9fd6cc126d0347a6d
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
index 4941d9555b4c..217c5b58e2a8 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0f2c83f47b1bb99f7cbb3b833f961a4c
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1 b/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
index 0ae57cf29b5f..fd5d4699c32b 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a96d2e8116dac2f6076e489625a7ca5
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
index 6bbaa8433891..659aef167336 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http_parser.rb-0.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ac025d16b05c7d18536c08ba3100f443
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.20.0 b/metadata/md5-cache/dev-ruby/httparty-0.20.0
index 13b304d93649..c13158a7b463 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.20.0
+++ b/metadata/md5-cache/dev-ruby/httparty-0.20.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.20.0.tar.gz -> httparty-0.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0d8ffd10086fe36827a709cee5fb5f6
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
index 50c31acad98f..b513f628169a 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ffec366593c2b65f6d27f268d1864928
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
index 3754188ddb45..e7e113fdb305 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e077ba47986b83ab244e9f972b939a5c
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.10.0 b/metadata/md5-cache/dev-ruby/i18n-1.10.0
index 7ff03e7f8e5e..450b19bf6baa 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.10.0
+++ b/metadata/md5-cache/dev-ruby/i18n-1.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.10.0.tar.gz -> i18n-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5d47a3fbcdb9616bce5bdb77a57bb35f
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.10 b/metadata/md5-cache/dev-ruby/i18n-1.8.10
index d760c761e8b9..62f6dedbe2f5 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.10
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.10.tar.gz -> i18n-1.8.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f55beda10f1744e52c0a1b4249a83bce
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.11 b/metadata/md5-cache/dev-ruby/i18n-1.8.11
index c9737842a938..c78b65c2bc71 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.11
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.11.tar.gz -> i18n-1.8.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=86868518b8c67f9a395ec15b80a03111
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.9 b/metadata/md5-cache/dev-ruby/i18n-1.8.9
index 68043aed8973..40479719e8d4 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.9
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.9.tar.gz -> i18n-1.8.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dd0c9ab7783dfa69f2f8d9b3774d9f67
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.9.1 b/metadata/md5-cache/dev-ruby/i18n-1.9.1
index 8b8be8d7a767..bedacd6a5c68 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.9.1
+++ b/metadata/md5-cache/dev-ruby/i18n-1.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.9.1.tar.gz -> i18n-1.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=30474d11f91e43df9622f4f623d5e4eb
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 468e484e17af..750939658db6 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
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ee86831afdbff95e471bd2ac75980b9
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
index c4ead5a5d26d..823d31050121 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=671665ae4de18e07707d856059e4784d
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
index 295ed2cbb38d..17f7d14cb409 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a242850661130d49d475bcce2e3682a
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.12.2 b/metadata/md5-cache/dev-ruby/image_processing-1.12.2
index 2f90595c9e5f..25c9025496c1 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.12.2
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.12.2.tar.gz -> image_processing-1.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=33851f875f96219552587550014ff064
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
index 911c76a9eb01..18d28dd68ffe 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5f4d1aebfef3295da7a3c57bdfabba3d
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
index 36d9c9bef3b7..a250d067c1eb 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/inflecto-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7775dc7614cb84a6cf690d445c94bf7d
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
index 9704cf034bba..cdc3c0008def 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ac25c52417723dea140f2281e54efd3f
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
index 56df62f74253..082fbe9c0e72 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/instance_storage-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aada695271470825fbaaaf1420aa6d07
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
index ce67292343cd..f181a091c1da 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instantiator-0.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=52ececfb137b4663bc283f6dffa650d7
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
index a22945ea9362..5c164560bc68 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b97588386b4a65370be18eadf00830af
diff --git a/metadata/md5-cache/dev-ruby/io-wait-0.2.1 b/metadata/md5-cache/dev-ruby/io-wait-0.2.1
index 1dd4f44e9c81..9ee01a9c9129 100644
--- a/metadata/md5-cache/dev-ruby/io-wait-0.2.1
+++ b/metadata/md5-cache/dev-ruby/io-wait-0.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/io-wait/archive/v0.2.1.tar.gz -> io-wait-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=85e5aafcb270c4d74cad4471c84c70e2
diff --git a/metadata/md5-cache/dev-ruby/io-wait-0.2.3 b/metadata/md5-cache/dev-ruby/io-wait-0.2.3
index ae0e224279ab..62c066bb6116 100644
--- a/metadata/md5-cache/dev-ruby/io-wait-0.2.3
+++ b/metadata/md5-cache/dev-ruby/io-wait-0.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/io-wait/archive/v0.2.3.tar.gz -> io-wait-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=85e5aafcb270c4d74cad4471c84c70e2
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
index 972d78c7a9a0..7b2cef5c49ac 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5349034afd92e9b952ea9fc6880ab7b0
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.6.1 b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
index 11b2204c3e4b..e1340b9dff96 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.6.1
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/itextomml-1.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=102e3db660d03ae02b07b715649051be
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
index 6733a05c2575..487c4a3c6e39 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=da6795dfcf466dd24692528babe91ceb
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
index 0b8b727550c5..25ff19e7fa40 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
index 035c35adf440..f7c13362f11f 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=62d6ca66b3865bf969e5f1a303dbe216
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.6.1 b/metadata/md5-cache/dev-ruby/jmespath-1.6.1
index 90f7e63c5faa..1dbeb62e231e 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.6.1
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.6.1.tar.gz -> jmespath-1.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=392935e47fcc3d742bca0015cef42b01
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
index a79f796a43d8..6038c5772871 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
index 3428d19ee8cd..cc344009e250 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
index 6e651ae0cc15..5c0282419c49 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=421f88884e5aaa5f1f41f0bda0d94503
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
index 8bd8b26a8d79..1054a3759643 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f3e8ee98d30daf607b0f3c71124b33e3
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 512e393f9005..67200ce2f715 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4.2
 SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d26a2bef7fc0c8b4c636a98c7e53f883
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
index 45c8e0a0b482..4a28e8c97a60 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4.2
 SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=057763b7ed408666b299ae7034c95029
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1-r1 b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
index 401e252b3cc3..ce2dac53510d 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1b56458d8777098a8b6b836c68c7994e
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.1 b/metadata/md5-cache/dev-ruby/json-2.6.1
index a334cde35b3d..6653b0264181 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.1
+++ b/metadata/md5-cache/dev-ruby/json-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.1.tar.gz -> json-2.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9e2d7fb76d82258a3f6b81ac18e10e9a
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.2 b/metadata/md5-cache/dev-ruby/json-2.6.2
index 4d250736fb2d..46c4d8ce6972 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.2
+++ b/metadata/md5-cache/dev-ruby/json-2.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.2.tar.gz -> json-2.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b1c1e615e5cdfb5683496cdef582c58
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.9 b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
index f467ea221c41..c382b866c0aa 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.9
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.9.tar.gz -> json_schema-0.20.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19f1b498088c61ab4cd3d42b65e4c625
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.3 b/metadata/md5-cache/dev-ruby/jwt-2.2.3
index 31c0d1b30c40..bd04207c7b77 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.3
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.3.tar.gz -> jwt-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b769bfb940bf040c19bb02b01e002a96
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.3.0 b/metadata/md5-cache/dev-ruby/jwt-2.3.0
index 64d1f3e8b3bd..f7dfd5285fa1 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.3.0
+++ b/metadata/md5-cache/dev-ruby/jwt-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.3.0.tar.gz -> jwt-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b6f4d1d25e9f9129aeaab07d2326a2c
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.4.0 b/metadata/md5-cache/dev-ruby/jwt-2.4.0
index 6054686f3f24..ec5b3e211c92 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.4.0
+++ b/metadata/md5-cache/dev-ruby/jwt-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.4.0.tar.gz -> jwt-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ee2c05a3b4307dd8ec4bf52a716f03fa
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.4.1 b/metadata/md5-cache/dev-ruby/jwt-2.4.1
index 5ee97646396a..dde52ca0eeb5 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.4.1
+++ b/metadata/md5-cache/dev-ruby/jwt-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.4.1.tar.gz -> jwt-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ee2c05a3b4307dd8ec4bf52a716f03fa
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
index 37fded8ed8c9..7d416844a1b1 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/KirbyBase-2.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d0aeb045a761c014054f3138cd41e714
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
index 508555d1d830..c2fbe8522605 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kissfft-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fccbabc23458c3710650d2899bb03965
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
index 8b3a768843e5..27a6d6c6bf1a 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a994fb0c3df901cf2a9407ae9d1deb5
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.2.0 b/metadata/md5-cache/dev-ruby/kpeg-1.2.0
index ab47efaa1241..783a226a9d0a 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.2.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc8ea8c182048d3b492446bab422b026
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.0 b/metadata/md5-cache/dev-ruby/kpeg-1.3.0
index c09c11eb41fb..e5e8135556f7 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc8ea8c182048d3b492446bab422b026
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.1 b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
index f58a8488cd65..10ce6fcfd5e2 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a28155fe9eb30ab097b80a58e0f4fe2e
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1 b/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
index 5c8ac8ae30b7..2f415211feef 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4cca4f64f6125574fcc9ad986298d690
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.2 b/metadata/md5-cache/dev-ruby/kramdown-2.3.2
index e9ff44fd0e1b..e7c3221bfd23 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=10491432698ff1ddde34e849d6b61ed2
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.4.0 b/metadata/md5-cache/dev-ruby/kramdown-2.4.0
index 609046fbc058..67c0572e8f2a 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.4.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3279bac35b56793d1ed3aa83947e7aee
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
index 24c9a23e7986..9f2656ed6b48 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ced1f583effeece85ca27f310a401c9f
diff --git a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1 b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
index 347bb1ce690f..b2cf7c8c32ee 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-syntax-coderay-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=915f2aff4e019f932457fe39fc505f23
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index e17443f79ac2..21ff25698f81 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfc43a73d5cdda063515759e1f6021f8
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
index 964318323f3c..b27ee7e757bc 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lemon-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b38ac004f5e574c83a9e43d09d65c79
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.8.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
index 1a5048698a27..57e5a59104c5 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.8.0.tar.gz -> letter_opener-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0a911ec913c1262e7a97ee5f9719c60c
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.8.1 b/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
index 1354153c157c..18c4f06162de 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.8.1.tar.gz -> letter_opener-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0a911ec913c1262e7a97ee5f9719c60c
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
index 41a8b9b75920..d5910df33efd 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/levenshtein-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b4f0cd944611a12f53a146925c75e901
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4 b/metadata/md5-cache/dev-ruby/libusb-0.6.4
index 7320392e45ea..4326acd2e352 100644
--- a/metadata/md5-cache/dev-ruby/libusb-0.6.4
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a44a6859389286cab399044e36d3731d
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1 b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
index da86b87a0ae5..ebf1008eb34b 100644
--- a/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8f87aee07190d031d2ac978d28865802
diff --git a/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1 b/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
index 3b23a61f69f5..0ad2df6f4dd9 100644
--- a/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Shopify/liquid/archive/v4.0.3.tar.gz -> liquid-4.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cc78ec40d6d9c62f130462a1d3924bab
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.1 b/metadata/md5-cache/dev-ruby/liquid-5.0.1
index 9d01636c5ea8..bb0b167887df 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.0.1
+++ b/metadata/md5-cache/dev-ruby/liquid-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.1.tar.gz -> liquid-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8439b1563be269eaf398bac553e9b4be
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.1.0 b/metadata/md5-cache/dev-ruby/liquid-5.1.0
index f5655c60e30b..2df9ee3cc45d 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.1.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.1.0.tar.gz -> liquid-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d9d73ccaf7e07ccfe46867da8f43edc
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.2.0 b/metadata/md5-cache/dev-ruby/liquid-5.2.0
index 32e5d737e345..44d5a0854ab9 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.2.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.2.0.tar.gz -> liquid-5.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e809a8bfbdb2a55d073ce54a72bd0f4c
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.3.0 b/metadata/md5-cache/dev-ruby/liquid-5.3.0
index 7b9edc400404..469d5d53f89e 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.3.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.3.0.tar.gz -> liquid-5.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e809a8bfbdb2a55d073ce54a72bd0f4c
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
index 0cbaa4698219..3154d0b914ec 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c47a72f1f40e8bea02b822b53756dc45
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.1.0 b/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
index 1c4585c3d819..20f22ef261e7 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/liquid-c-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=92faa52141bbe0dcd8b5ffcd91a8673a
diff --git a/metadata/md5-cache/dev-ruby/listen-3.5.1 b/metadata/md5-cache/dev-ruby/listen-3.5.1
index 166ca652ada8..74fc393af148 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.5.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.5.1.tar.gz -> listen-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=461543c32d0739b0dd3aa19eb2b92739
diff --git a/metadata/md5-cache/dev-ruby/listen-3.6.0 b/metadata/md5-cache/dev-ruby/listen-3.6.0
index 995a619d4d75..d57b709095b9 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.6.0
+++ b/metadata/md5-cache/dev-ruby/listen-3.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.6.0.tar.gz -> listen-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a7c928e6e73b500c0f2e131b11e0a33
diff --git a/metadata/md5-cache/dev-ruby/listen-3.7.0 b/metadata/md5-cache/dev-ruby/listen-3.7.0
index ff249bdd6e68..81eed93ff862 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.7.0
+++ b/metadata/md5-cache/dev-ruby/listen-3.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.7.0.tar.gz -> listen-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b1df5a94de0957286533be422f763ec
diff --git a/metadata/md5-cache/dev-ruby/listen-3.7.1 b/metadata/md5-cache/dev-ruby/listen-3.7.1
index 78b34973d0a6..b4d0f96f94d6 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.7.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.7.1.tar.gz -> listen-3.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=689caba4f00d982aa9191039dd82382a
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
index b69a41eec5e7..52ed09198eea 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/little-plugger-1.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c80c9f9f7163c657c86abfa12e4456b2
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.3 b/metadata/md5-cache/dev-ruby/locale-2.1.3
index d8e878534b96..a466f70cca5b 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.3
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.3.tar.gz -> locale-2.1.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=929e87c4770abf0ac0d8b1ee36745de9
diff --git a/metadata/md5-cache/dev-ruby/localhost-1.1.9 b/metadata/md5-cache/dev-ruby/localhost-1.1.9
index 7c6af0a41257..c77196bc5801 100644
--- a/metadata/md5-cache/dev-ruby/localhost-1.1.9
+++ b/metadata/md5-cache/dev-ruby/localhost-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/localhost/archive/v1.1.9.tar.gz -> localhost-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31c2b9ca46e8cc41c9cbbab57e8f802e
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
index c320291b1ef4..4ad8ae9a18fb 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lockfile-2.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9c064ee9af03dd511e2932a4aacc6051
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
index ffac26cc459d..a01fe1106ef6 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fd460ce96bb25f20307202c440d86a60
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
index 5ba539f7e2a0..e5d35def7460 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log_buddy-0.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8b8832ea4bf566106543f873e415ec32
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
index 066a813c1a04..20e3e33ffc10 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.18.tar.gz -> logue-git-1.0.18.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.12.0 b/metadata/md5-cache/dev-ruby/loofah-2.12.0
index 1d7d99dd3723..66a9cb939de8 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.12.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.12.0.tar.gz -> loofah-2.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc58a9a206ee26047ff3db1d97182d2e
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.14.0 b/metadata/md5-cache/dev-ruby/loofah-2.14.0
index 398d13edc672..09402303552f 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.14.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.14.0.tar.gz -> loofah-2.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e416cd2c303eb4a1861992b6ca8f98ed
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.15.0 b/metadata/md5-cache/dev-ruby/loofah-2.15.0
index f8879b431d9d..0cb04af2e8f6 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.15.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.15.0.tar.gz -> loofah-2.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7293ab8a9fb6b2f18d21ee48c1f32d3c
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.18.0 b/metadata/md5-cache/dev-ruby/loofah-2.18.0
index 8998a185703a..2376b82bd942 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.18.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.18.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.18.0.tar.gz -> loofah-2.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7d7643fc2d7702ef38340a558fa32b8
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
index a8ee7f54474a..ee6766e82fcf 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7c998626f77cf6876833a1fdd0cbb4d9
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
index 054fb81a6fb7..7c2a8fa2c0ca 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.7.tar.gz -> lumberjack-1.2.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=129d96678de518eacad1d3697f371a3f
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
index 5ae731384d37..d6d34f5f498f 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.8.tar.gz -> lumberjack-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15a56aad0b8c88481a474ef2be045e01
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3-r2 b/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
index 9b0f8c5a578a..ccc0b4a7267a 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mab-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=21cddda6d57462706ae3c069d2302a1b
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
index 2fc4f4689ef9..e2bc1f825dce 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5399893bc074ed83750255693e616a25
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r2 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
index 5a25593f7db8..b2f8f0c1bd26 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24d3d825f17abf190c6d3ec6a5d4084a
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1 b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
index 28a9662800da..6866a58a9704 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=00efd634f349570237b0c990276691a1
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
index 48280aec86f3..c049b7ddd09d 100644
--- a/metadata/md5-cache/dev-ruby/maildir-2.2.3
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4d3d43843b826bed2f28dc0f88476b41
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
index de1e8adac490..c1956f369e77 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/basecamp/marcel/archive/v0.3.3.tar.gz -> marcel-0.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=db1c803eab2af9ea6eec9740dcd42cb3
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.2 b/metadata/md5-cache/dev-ruby/marcel-1.0.2
index 78998a2475af..7328da138835 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.2
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.2.tar.gz -> marcel-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d66945fa4546c6d55695300075e37ff
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
index f8193492b2ea..4ee8f8078c9a 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/maruku-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2667f195449439ef666dda1e689aaeba
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
index 16203a567d0e..126329788a13 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mash-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=825878f2995579ab2de1382ce0a41c05
diff --git a/metadata/md5-cache/dev-ruby/matrix-0.4.2 b/metadata/md5-cache/dev-ruby/matrix-0.4.2
index 76c363415fd1..0dcd3b4ad0b8 100644
--- a/metadata/md5-cache/dev-ruby/matrix-0.4.2
+++ b/metadata/md5-cache/dev-ruby/matrix-0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/matrix/archive/v0.4.2.tar.gz -> matrix-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8adb2e9d322ea4410ba1070a375c336a
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.7.0 b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
index 0e4bac4dc05a..a12e286c82f5 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.7.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.7.0.tar.gz -> maxitest-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c566a087fdfca0f369a6a0cdc14ecdf7
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index e58163a4691e..78770f964e9a 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -11,5 +11,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=54d81a019187cd360f863fcd21491383
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
index 1212d162ab3d..99d698ae7536 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
@@ -12,5 +12,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=295d8fabf0f340f1ee304e20a033b738
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.4 b/metadata/md5-cache/dev-ruby/mechanize-2.8.4
index 72f196b45347..2976ccdb2137 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.4
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=79a2332d377f6c6cc7b1ec6d1a5186d7
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.5 b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
index 16c29b28b184..f2ce5cc6b81d 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.5
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5889eb1a6553eaee075ceb828d6f6b68
diff --git a/metadata/md5-cache/dev-ruby/memo_wise-1.6.0 b/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
index 94b09f6fdc19..a223cc4abc7b 100644
--- a/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
+++ b/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/panorama-ed/memo_wise/archive/v1.6.0.tar.gz -> memo_wise-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cfa49604500c9e7350ddb1bb41343e24
diff --git a/metadata/md5-cache/dev-ruby/memo_wise-1.7.0 b/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
index 54a416e1b99f..05cab35fe974 100644
--- a/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
+++ b/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/panorama-ed/memo_wise/archive/v1.7.0.tar.gz -> memo_wise-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e8423d5973e9e1be9f388ff9df553a6a
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.16.2 b/metadata/md5-cache/dev-ruby/memoist-0.16.2
index 0f71b5acab73..b43f63d01a0d 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.16.2
+++ b/metadata/md5-cache/dev-ruby/memoist-0.16.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoist-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed2eb86441c4f08116b50d198ced80fc
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
index fd6227ef0f1e..13225dfef8d9 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoizable-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d7fac76bd2891989626bf54ca020fc9a
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
index d2205276af1c..ff96cb41f666 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoize-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cd03154c38cfd266d6695937ef199dd1
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.4.0 b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
index 8624e3a77201..ffdcc73da652 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.4.0
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mercenary-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=42a456151bd16190a9a2cd018896d5a4
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
index 993eb7fe8849..1977bdec3fb5 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7efe596069b4c82020c806c4d0da62e6
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
index 121a6af562a7..d6a9d4e708c6 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7fc4ae66c914eb3b95baa15c1ae4b4e3
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1 b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
index 08a9994fc6ed..92a5429dec44 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/metasm-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3ec67ecf73c2adfdd2f74901c68fafb8
diff --git a/metadata/md5-cache/dev-ruby/method_source-1.0.0 b/metadata/md5-cache/dev-ruby/method_source-1.0.0
index 8e74df0c716d..c9fa62a3354b 100644
--- a/metadata/md5-cache/dev-ruby/method_source-1.0.0
+++ b/metadata/md5-cache/dev-ruby/method_source-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/method_source-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=345edf6244d98b387564d88d0b7ac4bc
diff --git a/metadata/md5-cache/dev-ruby/middleware-0.1.0 b/metadata/md5-cache/dev-ruby/middleware-0.1.0
index 4f3012227d4e..7f3672699c8e 100644
--- a/metadata/md5-cache/dev-ruby/middleware-0.1.0
+++ b/metadata/md5-cache/dev-ruby/middleware-0.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/middleware-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=970cb3602ad87c3a8280bb9fff0da4f3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.3 b/metadata/md5-cache/dev-ruby/mime-types-2.99.3
index 5e0ebe945af2..2ec0659b2c35 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.3
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/mime-types-2.99.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=174505364f3e647adc3eb80448c9304d
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index e8fad48f60ff..19ebe2c31ed2 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6b15ec3a6e33b483c845e016202140fb
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.4.1 b/metadata/md5-cache/dev-ruby/mime-types-3.4.1
index 2a6a9faa2159..f4bf60bebc53 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.4.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=11c60b8de85c5d50a229ce554be5ba4e
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
index 341c176523b6..c4b95bb2f67f 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0901.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b3620756c6eecd4ca9e39afa352e13b3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115
index 4e7338917e92..a42b129ab927 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.1115.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=39cfb4522caadf9b4c18e9a36b5720e1
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
index 16828ff9bb80..aa85b3100268 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2022.0105.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cb95bd8962308a3f526e7a535b2e90d
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
index 96d07a4390bc..96d1766a26e2 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8cea8b455708e85d72d76868c1a59e7
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
index 83a961d1c50a..fc8a488f6e4b 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8bb639fca2e58d986d8b04f1ee58cf0f
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
index 274295232b83..b4edd1bc930b 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=efcbca3c854049164e3949ccf3ced057
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
index a0023863f029..9d55e0b03169 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45e0ed3cd6dc968e4580860d0b0cfd6f
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
index 8d32214496a2..b36b285b04a2 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9dca8e57070ca9fbb4e4a79c4b3aafb7
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
index 8eee9b101c5c..215286a261e2 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=460675914b80c52d10a5a88de5806806
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
index 31303355db51..345f14725bb8 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.3.tar.gz -> mini_mime-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc8267fc90625e5f91550b2fb0eb3b7c
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
index d10ce8a13632..67c5c1f82c5e 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.1.tar.gz -> mini_mime-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c385e14ab7693b86ba291183347c080
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.2 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
index 5169efdeceba..034c3b5555b7 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.2.tar.gz -> mini_mime-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dc45a64acd94e5f7248081b0c3b73863
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
index 5fd0c46d55a2..c767491f3b86 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=013b69b95bf66e06b59f42a55dcc009f
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
index 379dbf5d333a..19e8289eefc0 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=18776e09ecb607afdd6a5cec2b781752
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
index c8f843cf3109..5a90b8117532 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70381ca36c064fd92beb0f9e0114ad70
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
index 3247b2df7c31..0639d15c1fe0 100644
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a498bb4aa37c1f97ae58a72b2dee152c
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
index d0b3a000f73c..8eeb2aec37ba 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=69099d02fef7f53f67f1f23f07c7f5d3
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9-r1 b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
index b16a34e46606..5519bb78504e 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bffdaecaa75ad28583ae23b15d59d642
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.13.0 b/metadata/md5-cache/dev-ruby/minitest-5.13.0
index 2b4b040f45a9..13660904e859 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.13.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8124596b9eab8ef82e16e1e87916dff4
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.3 b/metadata/md5-cache/dev-ruby/minitest-5.14.3
index 6e1abf6a0cb5..a381c7851ef0 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=405bdcf2b1bb6ce8de0727ec06b535dc
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.4 b/metadata/md5-cache/dev-ruby/minitest-5.14.4
index cddc1bb01c86..8ca7d445bb02 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=17a583cbc9ee96e05d5ed3ebdab42869
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.15.0 b/metadata/md5-cache/dev-ruby/minitest-5.15.0
index 258ac03d6537..cb66677e5d2b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.15.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45826a82dffc65016b38c92964c3dd88
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.0 b/metadata/md5-cache/dev-ruby/minitest-5.16.0
index e81c09e7f105..f9e9126a2960 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.1 b/metadata/md5-cache/dev-ruby/minitest-5.16.1
index c1d8cb9bd5f7..1dab4c757dba 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.2 b/metadata/md5-cache/dev-ruby/minitest-5.16.2
index 552c46fe3b85..097f89cb70d7 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.2
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1 b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
index c423f6d67695..199931d8469d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-around-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=878699328e88aaeb673fda0c6c744da8
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
index 06b89def3a72..08e56b39fcb3 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cdaadf92fb735137084e541b550946b5
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
index 930bcf41b05c..31132fdcbd7c 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f8ce45a5cf4e253a3a869e50d5dfef8d
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
index cdc12e4d4249..a4a4d3fe2023 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ef6a273015b4c7aa226d25b7b64b3a2
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index e96d85866feb..b113eddd9144 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d77c793efe0453c556c02db8498c3c0e
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index 7be379a98186..60b9dab649f8 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=82e134f63e286b37ae5c7d319cebd3e8
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index 7b4367978470..9abf7ce31433 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bb7b4d1b193c5fcc3bbe7fe21a600d2c
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9 b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
index 98ecf1913c1e..874f5bd0cc4e 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v3.0.9.tar.gz -> mixlib-shellout-3.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=234f85fdc7a1aeb858f17da8def1318c
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1 b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
index f1306b4fc08c..413d5d1f2a11 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44f7a40fd292fa9e52a493ab2868e8e8
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.13.0 b/metadata/md5-cache/dev-ruby/mocha-1.13.0
index 76b6f506b9c8..d0d255004216 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.13.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.13.0.tar.gz -> mocha-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3c570772cdcf81f2cdc6bfb93d444d28
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.14.0 b/metadata/md5-cache/dev-ruby/mocha-1.14.0
index 8dfed3d1a432..047d2bd9dfe1 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.14.0.tar.gz -> mocha-1.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8ce16f3975ca0a45bc401a492f6751d7
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.3.0 b/metadata/md5-cache/dev-ruby/moneta-1.3.0
index 874c42598079..e0739878396b 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.3.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.3.0.tar.gz -> moneta-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.0 b/metadata/md5-cache/dev-ruby/moneta-1.4.0
index 46256c75da71..8ff8cbdb69a0 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.0.tar.gz -> moneta-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.1 b/metadata/md5-cache/dev-ruby/moneta-1.4.1
index 08deb07653d1..b44c474821ba 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.1.tar.gz -> moneta-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.5.1 b/metadata/md5-cache/dev-ruby/moneta-1.5.1
index 2ed378b4a179..f8e1fbb87b15 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.5.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.5.1.tar.gz -> moneta-1.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/mqtt-0.5.0 b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
index e46a73157eda..00b33bd9bc15 100644
--- a/metadata/md5-cache/dev-ruby/mqtt-0.5.0
+++ b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/njh/ruby-mqtt/archive/v0.5.0.tar.gz -> mqtt-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ebdd4c1bf06228ee8c0a1b0f57aec687
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.4.5 b/metadata/md5-cache/dev-ruby/msgpack-1.4.5
index 5dab6b0d20a2..638cfc98f107 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.4.5
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.4.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.4.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=79481dcd179e9a1ff8fd338ea4355496
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.1 b/metadata/md5-cache/dev-ruby/msgpack-1.5.1
index 30eba93977f6..13c590392e61 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.1
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b387caf2d359eebd47cee8d609700c54
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.2 b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
index 82a69d1f820d..fab41e3332b5 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2329da581e09bcdf739cb530346da3cb
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.3 b/metadata/md5-cache/dev-ruby/msgpack-1.5.3
index 5c45ad767e31..7e16b1453411 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2329da581e09bcdf739cb530346da3cb
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.14.1 b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
index 4d582accade8..b2d40837b87b 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.14.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.14.1.tar.gz -> multi_json-1.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7d69b69aa313fe02b40f7eb04b921a3d
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.15.0 b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
index 8daf58fa0af6..65b09eb81610 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.15.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.15.0.tar.gz -> multi_json-1.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8fdf5b702cab1e1aeb2a8ff474f7c1e1
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
index d1cdf813f84b..044ce30b0d8c 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ec84829980277d8a7135445e496645c9
diff --git a/metadata/md5-cache/dev-ruby/multi_test-1.1.0 b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
index 49512f97a223..ea382c6e0020 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/multi_test-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=41b64c6d8f73f18926a9002b4c87ca8d
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
index 4b31b76a54ce..420b3e7d69d3 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8ac9ac39ee4b6900e2ac52472728a134
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
index e047f06b4f81..39f333c4a0be 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=094b78269534e7904e99ab76f38b0e40
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
index 3f2248f53447..62c6b03c9c30 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bb49e1b555e9e14fe434b574784f129e
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.0 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
index 9e989672b067..1b577b48008f 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.0.tar.gz -> multipart-post-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f52131522e52c36d7cdedb154e1b79e0
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.2 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
index 37eb7d394f67..7431abc049b9 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.2.tar.gz -> multipart-post-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f52131522e52c36d7cdedb154e1b79e0
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
index 6437bcedd646..3f38a52a235a 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.3.tar.gz -> multipart-post-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f52131522e52c36d7cdedb154e1b79e0
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index c4b6a765c8a0..320acc97f640 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d17f53ba25c840665f9a7a2e2874b1c4
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
index 33be6ec2b452..a39dcf3f8c19 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6527ebaab249c5b6743c99bf2e2d2ac4
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.1.1 b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
index d629a4350ebc..6273f7461cad 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/mustermann-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=22c9a98aa992dfe6bdb85099e82ea299
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
index d6de25c4e971..fa5df25f99cc 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby26 ruby_targets_ruby27 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://rubygems.org/gems/mysql2-0.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ee1cda08464110842bace043b79133c
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
index cc1a742c8fcc..c1b79dae0987 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby26 ruby_targets_ruby27 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://github.com/brianmario/mysql2/archive/6652da20010ddfbbe6bceb8e41666d05e512346c.tar.gz -> mysql2-0.5.3.20210920.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b8b1ffa5be129d4bc411841981a2919
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.4 b/metadata/md5-cache/dev-ruby/mysql2-0.5.4
index 4a79b957958b..050d58868571 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.4
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby26 ruby_targets_ruby27 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://github.com/brianmario/mysql2/archive/0.5.4.tar.gz -> mysql2-0.5.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5ba9c9138b305c9de83d58f2a5489813
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2
index 3bab0fb81610..0b03c905b7ae 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nagios_analyzer-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=99a682e2169289503e1a3802c313e292
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
index 1d21d7f88bab..483ec36a7af8 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=840589afa227ccb0586db77ea8476660
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
index 449fec92e0b7..98479cce80da 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a6e7a5cd4eb7da82fc490628f76e1107
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
index aebd9c8e84fa..0ecd46913c15 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4146c5332b425f9a3f7a672e65ff2a9a
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0-r1 b/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
index a856324e45a1..4ff4381da86c 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/naught-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4ee64cb2ca7f0e0f5e2630133412fbcc
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.5.1 b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
index 7b13b094a635..dbae5328f1c1 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.5.1
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/necromancer-0.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1365ed1f8149a96ef7b2b3675e2f5223
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.7.0 b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
index af8ec6c2d7c4..0c6c6a333c13 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/necromancer/archive/v0.7.0.tar.gz -> necromancer-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b3edc397a3c182b5662b5dde9f71a2f
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1 b/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
index 9064b5135f18..c940fdfc06d7 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0722841f903d0392cb57222e82312616
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
index 2029842907a2..902431584478 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/neovim-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b5a33a9356267b812a7a9ea9f9fe327d
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.1.3 b/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
index ca173e480d84..b49714bcdf32 100644
--- a/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-ftp/archive/v0.1.3.tar.gz -> net-ftp-0.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44f596769546ee99cbc1619781c59ee9
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
index 2cf6641c4ae2..8cc348d1d21a 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fd706a3cd80c154674ba44173d3f615c
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
index 5508f209f19f..2adfa414bd89 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/net-http-persistent-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d4823acda6f39b2a3bac8340d7acefc
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
index 644306d971e7..0893fcf19c16 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7242a6ddddba714ab77dc52cdae529a7
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
index c17407dc4d0d..a51edb0dfb34 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/net-http-pipeline-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e44a8dc364e424939fbdc80f60a71e1
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.2.3 b/metadata/md5-cache/dev-ruby/net-imap-0.2.3
index 5926ae69c5f7..5e908f75e028 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.2.3
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.2.3.tar.gz -> net-imap-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4aa22faaafe28e7e2339cdf10e5a8d7
diff --git a/metadata/md5-cache/dev-ruby/net-pop-0.1.1 b/metadata/md5-cache/dev-ruby/net-pop-0.1.1
index 5c1e4bf4e9a0..c5dc2231f609 100644
--- a/metadata/md5-cache/dev-ruby/net-pop-0.1.1
+++ b/metadata/md5-cache/dev-ruby/net-pop-0.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-pop/archive/v0.1.1.tar.gz -> net-pop-0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0a0bc970e2125136c25926faca586ceb
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.1.2 b/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
index 1acca24f4793..72d2d8c4c76c 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.1.2.tar.gz -> net-protocol-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cd7031a52cfb1f51cfd04c3b26789935
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.1.3 b/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
index 4191a8d3075a..76ecaa911ef2 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.1.3.tar.gz -> net-protocol-0.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=58ab95f03d247cc0ea7f7e567caf024b
diff --git a/metadata/md5-cache/dev-ruby/net-scp-3.0.0 b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
index 85e344a15a45..b8a3c2300481 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v3.0.0.tar.gz -> net-scp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56345fcf3f4861864b88dc697d312ff5
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0 b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
index 31b4241cfc47..f286a702c50a 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-sftp/archive/v3.0.0.tar.gz -> net-sftp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f204728753df33bee8d85f861e23cdeb
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.1 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
index 3ea699f9a5e2..9d08cf2fcd9a 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.1.tar.gz -> net-smtp-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a794093bff3da21e2eaa886d308dcf4f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
index 22840a225900..83e1a841945c 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.2.0.tar.gz -> net-ssh-git-5.2.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed002f949b3e4b262a06ca0b637ed7a4
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
index a32f60a2fd31..0a8fe0dac83a 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e71e07afcf5a6a3549410b87b7520d51
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
index 8da83e03349c..60917e8a85b4 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=873976b4b912e83c27cfef623b43667d
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1 b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
index 8abbe2b37b65..80f40d8965e4 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v7.0.1.tar.gz -> net-ssh-git-7.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5a9cd250053e5a070d6ddeab018b221e
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
index 9c4025cd66bb..7be2fbde42b6 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc63069ec1878582cae7b1a5e1a7c274
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
index ec1843a9858e..4b4136c2dfda 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b143fd426b27eb310539b49449aae28
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
index 13aa6042ca7b..39178c38de80 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c8d7d2fdf71fa0a688442b931316fe0c
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
index 3af1504cea2c..6e2d5f4127f4 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0f0dd3406dc86fa294203547fb53b6ef
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
index 49d2e186e375..1dcba29eff24 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/network_interface-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5715262502a0fa3e6a22fb592c42095
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
index d241c49ed15e..56ce8d03c374 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/niceogiri-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=361ce9d16376c2e5abcda69fa34782f2
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.4 b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
index 884dc8f4a3aa..b674ab01ccb3 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.4
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=daf0fd8829a69b5f9c177203bc3cf002
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.8 b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
index e67203461d17..bb7049bc162c 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.8
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9373e0a583f5943bbe6836d0ef7a6871
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.6 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
index b7d3657ba02f..3b38dcef98a4 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.6.tar.gz -> nokogiri-1.13.6-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3afc25bfc9e13e1d804560bd0a3c905e
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
index 9a8480c9f047..f99df556e805 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nokogiri-diff-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f98e39d5ca9985de22d711fb9c0e4696
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
index 505f518de5c6..c3e3980e7f54 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ntlm-http-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0b8d0a2cd90c11876b401afe369e1ce
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.10 b/metadata/md5-cache/dev-ruby/oauth-0.5.10
index 529b9edb530a..94bc329137db 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.10
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.10.tar.gz -> oauth-0.5.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b600ec75d8aa010efe52380052d9e59c
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.8 b/metadata/md5-cache/dev-ruby/oauth-0.5.8
index 7bbd68b97135..014523e3b664 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.8
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.8.tar.gz -> oauth-0.5.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b600ec75d8aa010efe52380052d9e59c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
index b55278d6bad5..007484e3642d 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d54ad2da4786715e455c529415e282cb
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.22.0 b/metadata/md5-cache/dev-ruby/octokit-4.22.0
index fd58a91f51b3..befb45909e34 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.22.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.22.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.22.0.tar.gz -> octokit-4.22.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bea0c74f97ec33933a2dd73e9210f3f4
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.23.0 b/metadata/md5-cache/dev-ruby/octokit-4.23.0
index 59283e677db7..f2c082a95db9 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.23.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.23.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.23.0.tar.gz -> octokit-4.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6d7abb3b45e8abdb04163c6c5ad216e5
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.24.0 b/metadata/md5-cache/dev-ruby/octokit-4.24.0
index 5f490a9fbca2..3eb4a4580ca4 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.24.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.24.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.24.0.tar.gz -> octokit-4.24.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cf768aedd28987950a1a13e91fe0d1f
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.25.0 b/metadata/md5-cache/dev-ruby/octokit-4.25.0
index 5d1f316d5059..4dca685a207a 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.25.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.25.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.25.0.tar.gz -> octokit-4.25.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cf768aedd28987950a1a13e91fe0d1f
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.25.1 b/metadata/md5-cache/dev-ruby/octokit-4.25.1
index e0a34d25b9ee..a3c751faa53b 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.25.1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.25.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.25.1.tar.gz -> octokit-4.25.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d7cf6d39efe39fe561bf7e24f5f668ca
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.0.4 b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
index 3d9914cb785e..4b07af59f667 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.0.4
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/intridea/omniauth/archive/v2.0.4.tar.gz -> omniauth-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a8921c61d2e19844ad67e24c8f05c04b
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.1.0 b/metadata/md5-cache/dev-ruby/omniauth-2.1.0
index b7f96bc2afa1..b12555d0f3a0 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.1.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/intridea/omniauth/archive/v2.1.0.tar.gz -> omniauth-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bc23fd3d1dc7e50fdab520fa59454c7d
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4-r1 b/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
index 90893705eb8f..573a885c209e 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/open4-1.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2a0fd5c16d0bf2994055f56e5e47aaa5
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
index 25cb8cccb7ec..56a0b29fff0e 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.2
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=875e989ac26aa458b7d3cdd6aa5d1108
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.1 b/metadata/md5-cache/dev-ruby/optimist-3.0.1
index 90160cadd333..5fef56b16bac 100644
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.1
+++ b/metadata/md5-cache/dev-ruby/optimist-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/optimist-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfad935f2eec0806c1fbf9d0c01ff418
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1 b/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
index d14e8d5efa5f..66fb703e0d98 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/optionable-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=74aea0f8fdc5eda59051d98808541e53
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
index 71dede631cd5..d368ed16bccf 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=41669c1c5a392aa25762cc8c07d3b771
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.1 b/metadata/md5-cache/dev-ruby/origin-2.3.1
index 7402d3cf3f89..6d64142e279b 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.3.1.tar.gz -> origin-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cd0e62a71b4f6f0c57089e49eff29da7
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.10 b/metadata/md5-cache/dev-ruby/ox-2.14.10
index db0f4e9b0494..a529940e9e2c 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.10
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.10.tar.gz -> ox-2.14.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8fdc0b558b9ec0ed1384ee6bc5c364a0
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.11 b/metadata/md5-cache/dev-ruby/ox-2.14.11
index b1b88254e5e8..e5297597ef99 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.11
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.11.tar.gz -> ox-2.14.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=44af274c7a83f30602b109056963393a
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.8 b/metadata/md5-cache/dev-ruby/ox-2.14.8
index bf774190ebf7..d20712ce9de6 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.8
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.8.tar.gz -> ox-2.14.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9020d6248986fb82a03ba82d739164d6
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.9 b/metadata/md5-cache/dev-ruby/ox-2.14.9
index 2c9071b98977..72e535c1e39f 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.9
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.9.tar.gz -> ox-2.14.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c1d8bd011479d0ccd60413c925ece3ef
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index ca730ed5a54d..2a3ed00ee739 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1.13
 SRC_URI=https://rubygems.org/gems/packetfu-1.1.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=79ccdf5be14d8957f5d904881ce031dc
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.1 b/metadata/md5-cache/dev-ruby/paint-2.2.1
index 8cd30ced827b..022461473e02 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.1
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.1.tar.gz -> paint-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73d59dc3f97bfb54ed7b10878aa5cc0e
diff --git a/metadata/md5-cache/dev-ruby/paint-2.3.0 b/metadata/md5-cache/dev-ruby/paint-2.3.0
index 3be57206ffb9..04640b0b8114 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.3.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.3.0.tar.gz -> paint-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73d59dc3f97bfb54ed7b10878aa5cc0e
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.22.1 b/metadata/md5-cache/dev-ruby/parallel-1.22.1
index 0b9bea27f918..2f95c9a281a5 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.22.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.22.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.22.1.tar.gz -> parallel-1.22.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70c02c21abff2c1249c0e7bacca3e277
diff --git a/metadata/md5-cache/dev-ruby/paramesan-0.1.1 b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
index 2e11b0858f61..6c452062e3ba 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-0.1.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/paramesan/archive/v0.1.1.tar.gz -> paramesan-0.1.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4082f55aca0133f24586924aecfc11ca
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index 9ec54588d390..78eb487e9389 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb1c3b74530dc318685479a20bfceba5
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
index 226cc3ee83bf..3f497f5409e5 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4813e5af95324157fdcb85d23cded044
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
index 5ba9fa1ef225..592fdc04dbf7 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c2c637fb3c8788602d77d5a331d5bf7e
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.3.2 b/metadata/md5-cache/dev-ruby/parser-3.0.3.2
index 32a46ac5ceda..478261972dc1 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.3.2
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.3.2.tar.gz -> parser-3.0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8123b7cbfc57e7fe99d513e70f9d3f57
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.0.0 b/metadata/md5-cache/dev-ruby/parser-3.1.0.0
index b9c73bb0e03a..02b96428fac5 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.0.0.tar.gz -> parser-3.1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.1.0 b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
index 718eebc3be16..1fe0b2c26f9a 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.1.0.tar.gz -> parser-3.1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.2.0 b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
index b71ea2169d37..8855dc525e07 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.2.0.tar.gz -> parser-3.1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index c55c55a07494..006ceea790f1 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.8.0
+++ b/metadata/md5-cache/dev-ruby/pastel-0.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cce0b02aa83ad133ce225ea3b655f96e
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.0 b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
index 44a443dfe3b5..95a00b16d9af 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.0
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3ab5ccb7bf9c9ed9f2de854d681b41fb
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.1 b/metadata/md5-cache/dev-ruby/path_expander-1.1.1
index de3c7f7b6408..3a38a11672fe 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.1
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=490e902121c3af5e03c98dc1b54cc625
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.16.2 b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
index 0379cbca0e8f..424a66dd65f3 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.16.2
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/pathutil/archive/v0.16.2.tar.gz -> pathutil-0.16.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2773ee4d8a0940af16e09e628959d21b
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index c12f7368b067..a7ab5549c63d 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=635f123be43cf1914dab4cde1e75e2c9
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
index c839b80bfe61..15e961e4a6c8 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0.13
 SRC_URI=https://rubygems.org/gems/pcaprub-0.13.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f422acf74dd9f7222ab9888e78686c1f
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
index e5efc0ba876b..8b6b0ada9799 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.9.0.tar.gz -> pdf-core-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8a6d293e4f4e08b9e81aef4465e63e19
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
index 78e6d77c22be..7deab4cdf568 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pdf-inspector-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=92bb57c1735e9f7a655832547bab7ba7
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
index b9303bb92c9e..f0c76e12d833 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5a2731e2698075d9c388bcddec78f28d
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
index 4da66dc19171..9c8369a3bb2b 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.10.0.tar.gz -> pdf-reader-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ac676146b053884b5c4cfb297d143eb7
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.8.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.8.0
index d42316fda005..98ba7e448945 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.8.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.8.0.tar.gz -> pdf-reader-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0188a2b694b2ee4b888ec569baa92c6
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.9.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
index 605005b6e2af..497ae2d906c2 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.9.0.tar.gz -> pdf-reader-2.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0188a2b694b2ee4b888ec569baa92c6
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.9.1 b/metadata/md5-cache/dev-ruby/pdf-reader-2.9.1
index 552e8e7b7db9..91015ca245b4 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.9.1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.9.1.tar.gz -> pdf-reader-2.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0188a2b694b2ee4b888ec569baa92c6
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
index 06ca5d3b3010..355f4bb39346 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/permutation-0.1.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d39ef77dbcdd9e24c729744af41686f
diff --git a/metadata/md5-cache/dev-ruby/pg-1.2.2 b/metadata/md5-cache/dev-ruby/pg-1.2.2
index 2580dde51f18..d0aee9f4365d 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.2.2
+++ b/metadata/md5-cache/dev-ruby/pg-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/pg-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=83cc29a34cfc7ab5e94ffade28ef5aa8
diff --git a/metadata/md5-cache/dev-ruby/pg-1.2.3 b/metadata/md5-cache/dev-ruby/pg-1.2.3
index 62945ca495d7..e55e66b74a3b 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.2.3
+++ b/metadata/md5-cache/dev-ruby/pg-1.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/pg-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9f0aa102465aa0bd766cd77f06ec644
diff --git a/metadata/md5-cache/dev-ruby/pg-1.3.5 b/metadata/md5-cache/dev-ruby/pg-1.3.5
index 16a53cd24023..bed63bea5577 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.3.5
+++ b/metadata/md5-cache/dev-ruby/pg-1.3.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.3.5.tar.gz -> pg-1.3.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7952809239c59e0131927bd7dafcbd9
diff --git a/metadata/md5-cache/dev-ruby/pg-1.4.1 b/metadata/md5-cache/dev-ruby/pg-1.4.1
index 8e8920407ad9..c604fe2ac38b 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pg-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.4.1.tar.gz -> pg-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7952809239c59e0131927bd7dafcbd9
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
index 282b11be6372..904d90078402 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.0.9
 SRC_URI=https://rubygems.org/gems/pg_array_parser-0.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=728ee6f22c8ab109920d14ae953eb62a
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
index 7d3538857b2b..db29b0200212 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e0d9da3d651b6bf4a60aebbc0d034e3c
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
index a792d20e9fec..f5cb0a008108 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=30423886b6c87d83bc93239a6dde327e
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.7 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.7
index df58bd1223ad..4b8f44cc2352 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.7
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=acbbb455c8c20202a67005a730112619
diff --git a/metadata/md5-cache/dev-ruby/plist-3.6.0 b/metadata/md5-cache/dev-ruby/plist-3.6.0
index 90cb02aa54b8..1441a44df093 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.6.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.6.0.tar.gz -> plist-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3cb10d88689c7544b92912cfa55bef96
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
index 8bd0a7ec8eb0..87e5ba2ab0c6 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f138e10f675e9d31eb1117f97789470
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
index bb86f3305b4d..82b6a89dd938 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/podcast-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e445c45fa3d637501b81bb79d402462a
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
index f728efa62783..bb9b1d6b8d6c 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/polyglot-0.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a553ec18f77e42931fbf4411b5fc49ec
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
index 27c2b01a02b0..1a5b3eb3e9e8 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/posix-spawn-0.3.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d4ca3d27486d8b50d965c8b10d70837c
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.7 b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
index cf3d56fdaf84..d4f2373aef57 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b01c7376d047a656c1f9f137fdf2b8c7
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.2.0 b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
index d311683cec7e..3c2ce11ae827 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.2.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v1.2.0.tar.gz -> power_assert-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=307cba43edef1687661822595092456a
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.0 b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
index 33da8dc0f9b2..487de8cead3d 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.0.tar.gz -> power_assert-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=202b4d3644cd1db5af8af0040e8b4c6f
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.1 b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
index 3443843eb6f3..cd5576ee4698 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.1.tar.gz -> power_assert-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7afc6bbf41a61ea8f2fa1c2e67a970ad
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.4.0 b/metadata/md5-cache/dev-ruby/prawn-2.4.0
index 48724ed04165..ddb6cde9950b 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.4.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.4.0.tar.gz -> prawn-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d4a6fc0aa6de1dd6662baf643efaea7
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
index ba78037f6774..53055f390585 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/prawn-table-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e9f678d5fd6baa991c235766e47e2a4c
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2 b/metadata/md5-cache/dev-ruby/prime-0.1.2
index 7ab707d1aff4..98ff229834ad 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ba904a5e8ca30af6b3786c305a63d043
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1 b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
index ef3eabb0922e..5b6fd4b37d39 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3270ca105db0d469e5feb650bfb7c5a3
diff --git a/metadata/md5-cache/dev-ruby/propshaft-0.6.1 b/metadata/md5-cache/dev-ruby/propshaft-0.6.1
index 1d53a11e295f..374546ad30b9 100644
--- a/metadata/md5-cache/dev-ruby/propshaft-0.6.1
+++ b/metadata/md5-cache/dev-ruby/propshaft-0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/propshaft/archive/v0.6.1.tar.gz -> propshaft-0.6.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ccf16070c5ea39308831ffae3de373b9
diff --git a/metadata/md5-cache/dev-ruby/propshaft-0.6.4 b/metadata/md5-cache/dev-ruby/propshaft-0.6.4
index d3623d5f5b98..c46b02be7d24 100644
--- a/metadata/md5-cache/dev-ruby/propshaft-0.6.4
+++ b/metadata/md5-cache/dev-ruby/propshaft-0.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/propshaft/archive/v0.6.4.tar.gz -> propshaft-0.6.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=df57b46358c7f26778bdc9ce47ec8167
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.1 b/metadata/md5-cache/dev-ruby/pry-0.14.1
index 33e197ddeb69..81510cbc7a2b 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.1.tar.gz -> pry-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=db518103d1852a9ed5ec214e2cbf7139
diff --git a/metadata/md5-cache/dev-ruby/psych-4.0.3 b/metadata/md5-cache/dev-ruby/psych-4.0.3
index 8ee991d75c8e..39f2cf0d79b3 100644
--- a/metadata/md5-cache/dev-ruby/psych-4.0.3
+++ b/metadata/md5-cache/dev-ruby/psych-4.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/psych-4.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=927b93a2754b933f5e40980590c8c0f3
diff --git a/metadata/md5-cache/dev-ruby/psych-4.0.4 b/metadata/md5-cache/dev-ruby/psych-4.0.4
index e7a1513edd61..03bb7ccb00e9 100644
--- a/metadata/md5-cache/dev-ruby/psych-4.0.4
+++ b/metadata/md5-cache/dev-ruby/psych-4.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/psych-4.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=563776a7463d93c68928a1c409eb4f98
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
index e29ce505dfe4..ba9cf02ff4af 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/public_suffix-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c0255de1017037823ce09499ef81da56
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
index 7bd53869e9b2..37067f2f16dd 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=befd869c2768a89a65597ff165e01ecf
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.7 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
index 997dd206e7ef..3658067e1628 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=61f0dff98a98df8612cbe2c04cf42c99
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.2.0 b/metadata/md5-cache/dev-ruby/pundit-2.2.0
index e4d8cf1fd568..b2ca419d1f2a 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.2.0
+++ b/metadata/md5-cache/dev-ruby/pundit-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7c19bf4f8a0633b00066863b1b493f7
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4 b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
index 19627e41649d..194ab14d0e97 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6561d89db28219445d210f486f5f2f52
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0 b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
index 6bd49c1f2071..04ffc0fb1896 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=83b3f246e97142a48126391f99ea9b12
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
index 454def0bee45..dc6e25e6bd02 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pusher-client-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=76b5e738b805c7c340ef299f364e8537
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2-r1 b/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
index 7528a856dfed..91a1edbb1bb9 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/qed-2.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73da0c905f61ebe986490bd66f885499
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
index e7c717b6c5b7..bdf8388061ab 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.4.16.tar.gz -> racc-1.4.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=14be7494d9823bf822fd579325929e03
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2 b/metadata/md5-cache/dev-ruby/racc-1.5.2
index 481a770b7b98..d200e4a301f7 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fdea1ac0499fdeec74f75f5035c2e639
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1 b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
index 59a87c15b997..57002113ae9d 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=363789ebaffbba84012876325523b01a
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2-r2 b/metadata/md5-cache/dev-ruby/racc-1.5.2-r2
index 5a3d3ba09631..5d87f5c5111f 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2-r2
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=35b6b650c99caf9e62dad799ea21d220
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.0 b/metadata/md5-cache/dev-ruby/racc-1.6.0
index 0ba251e6405e..37ec993ec86a 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.6.0
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.0.tar.gz -> racc-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7fa205595a672b1e1b811187af067b40
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3 b/metadata/md5-cache/dev-ruby/rack-2.2.3
index 9b81fb046ddd..a717385ef46f 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.3.tar.gz -> rack-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=32f4affe0b3c82536b55a61a25b8635e
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3.1 b/metadata/md5-cache/dev-ruby/rack-2.2.3.1
index 36f5b8c0c5f8..95a11cf56660 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.3.1.tar.gz -> rack-2.2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7239dc57b0d82bdd7231f0cd458a135c
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.4 b/metadata/md5-cache/dev-ruby/rack-2.2.4
index 77a25f49123f..f28c222a798f 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.4
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.4.tar.gz -> rack-2.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=256ba279d086c134ed40eb7e30840cac
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.6.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.6.0
index 5110840678ad..fb47b7ad8b16 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.6.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c46c189f581fb09c4ca11b9b357397f
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1 b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
index ae778eea7e02..a6d9f6021206 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ae746cd1ee96cf3f545f5aaf8a492770
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
index 04c8af8b9ca2..cc218acde2e3 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.13.0.tar.gz -> rack-cache-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ca01682309d337073803ac31d0fe736
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
index a53596346373..0b0bf36955bf 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9779bdb1011cf774e6179b3a3d73be4a
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.2.0 b/metadata/md5-cache/dev-ruby/rack-protection-2.2.0
index 3bcffbde7978..50eb4743042b 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rack-protection-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=66c222bdafb31dbc1c8215979c4e4574
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
index 96964f257cd8..afb45cdc9cb7 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8d855c9f881c0faf65be552d8e314bb
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
index e4e91b028991..7aa792d08ffa 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=83382e6e7cfdec5db9f7445841e5146c
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.5-r1 b/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
index 858a36e54fca..353e6559c8f0 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/radius-0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=570746d066a13e4e177b29cf058b834b
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.8 b/metadata/md5-cache/dev-ruby/rails-5.2.8
index e83978218a2a..87ddc1f48c90 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.8
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://rubygems.org/gems/rails-5.2.8.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b7206d08f9a5522b17d8a941ce1b41a4
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.5 b/metadata/md5-cache/dev-ruby/rails-6.0.5
index 4e1c73e5865a..a1fd4f32282b 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.5
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=59231c0a48c52d6dd4add66b5eb9af54
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.5.1 b/metadata/md5-cache/dev-ruby/rails-6.1.5.1
index d3558f75978f..bd627b5f114f 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e8420f07c9e57a507b6816cb8bf6bc2
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.6 b/metadata/md5-cache/dev-ruby/rails-6.1.6
index 6375fc43afdd..97d4ac5192a2 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.6
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e8420f07c9e57a507b6816cb8bf6bc2
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.2.4 b/metadata/md5-cache/dev-ruby/rails-7.0.2.4
index 18d052d0525d..74d11b5e9214 100644
--- a/metadata/md5-cache/dev-ruby/rails-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/rails-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://rubygems.org/gems/rails-7.0.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fd76ced42db48daaa65c3b242f784729
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.3 b/metadata/md5-cache/dev-ruby/rails-7.0.3
index b5eddd795d72..6383cd2da014 100644
--- a/metadata/md5-cache/dev-ruby/rails-7.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://rubygems.org/gems/rails-7.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ce75910e521afaa212e47259255e86c9
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
index 0f7c7614978e..1d6b942fcb31 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a389e304adb4e83ddfe5602a2e4da68
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
index 76d4ed2faeab..7485e9de6439 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f46aac98ab059181527ab38b7e280902
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
index da1ff898ffb9..7d8139e89758 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5c1b9187c2e95922d78d11aac0f813c0
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.8 b/metadata/md5-cache/dev-ruby/railties-5.2.8
index 9df9c8a03c84..e8044db7b497 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.2.8
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3badf0a1a42a5c6a492a2de15c3a229b
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.5 b/metadata/md5-cache/dev-ruby/railties-6.0.5
index 6ccace376e1c..6d75cf2f6441 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.5
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ab4461dcb9df3481ebfee5d107fd93e7
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.5.1 b/metadata/md5-cache/dev-ruby/railties-6.1.5.1
index c4af28ec6073..be30473c6a54 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.5.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.5.1.tar.gz -> rails-6.1.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31a962bf1ab595518066a192035a6756
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.6 b/metadata/md5-cache/dev-ruby/railties-6.1.6
index becd5b651adc..d12d66cc1a6f 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.6
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.tar.gz -> rails-6.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31a962bf1ab595518066a192035a6756
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.2.4 b/metadata/md5-cache/dev-ruby/railties-7.0.2.4
index 4586dcaeb958..39411a20b950 100644
--- a/metadata/md5-cache/dev-ruby/railties-7.0.2.4
+++ b/metadata/md5-cache/dev-ruby/railties-7.0.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.2.4.tar.gz -> rails-7.0.2.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=127e24521e3d4845bb8544c0f49ef8e8
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.3 b/metadata/md5-cache/dev-ruby/railties-7.0.3
index b58d986c13bf..4ffad52d6e32 100644
--- a/metadata/md5-cache/dev-ruby/railties-7.0.3
+++ b/metadata/md5-cache/dev-ruby/railties-7.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.3.tar.gz -> rails-7.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=127e24521e3d4845bb8544c0f49ef8e8
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.0.0 b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
index 9ddfced1d1e1..30459df58a18 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.0.0.tar.gz -> rainbow-git-3.0.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b2ed6ab41078bcb1cc281870c9d8fc7d
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.1.1 b/metadata/md5-cache/dev-ruby/rainbow-3.1.1
index 657c3b7131a4..8499f6a6688d 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.1.1
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.1.1.tar.gz -> rainbow-git-3.1.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b211376ebbbb70f9070ad1df1a6cebac
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
index 394a91e41af5..7a0e9e02c130 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c35578a5f46cdd37d953a0fc759f69a4
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.4 b/metadata/md5-cache/dev-ruby/rake-13.0.4
index 22c5e1af19c6..9515dc0462da 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.4
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.4.tar.gz -> rake-13.0.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f1f8dc5748b050b972f5456415f01792
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6 b/metadata/md5-cache/dev-ruby/rake-13.0.6
index cba1b21e9869..6caa5d830a32 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5eaf48595aefb8600a6c6582211e3fa
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
index f6481b608684..0b6c4a9a513d 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=42e30d7e06f60c6e315ed0a48a97add3
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index 4fcbc3498858..36a0c297ebca 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d7ccb16dc3a5618953172bd12ad3d122
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
index 31458a074543..061af0f3221d 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.3.tar.gz -> rake-compiler-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31851b496f8eb76cda1254bc52782e40
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
index 0ddd2f7ad398..2acb030614f5 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.9.tar.gz -> rake-compiler-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=14f3e9e1f6afc534f59e79f83d38eed2
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
index c834042a75c8..ad5150ab3280 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.2.0.tar.gz -> rake-compiler-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=14f3e9e1f6afc534f59e79f83d38eed2
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
index 3676f5b93b06..52dcf0e246c8 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rake-remote_task-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=be6a111f58bac513159dbcbefa1e1680
diff --git a/metadata/md5-cache/dev-ruby/rantly-2.0.0 b/metadata/md5-cache/dev-ruby/rantly-2.0.0
index d550748e29de..caf96e12c9ab 100644
--- a/metadata/md5-cache/dev-ruby/rantly-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rantly-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rantly-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=936d5bd074dc7505e4f48f6122567bff
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
index ff6facd04876..b6bfa33f377f 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.12.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfda74d6e76eca04235ca883a926d5e0
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
index 2e23626379a4..9e668f734c2e 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a88c69025438a92458ee35fa06aeea2
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
index ff9f7ed6213d..e232187b2afd 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gsl-2.1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a683a6196d47d1a410a9d2617dfe0943
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
index 0c9a56cbcdb2..16cbf281bfd7 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5819c2b71865cb104c8a4c1d445367b3
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
index 5497b946c3cc..19b37f0ddf0a 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-readline-0.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=58d81e41535689bedfbc84838e5ddf96
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
index 916a23eee5ae..1556a98a64e8 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d4934ca7c7591662375fb0de9e3e07ec
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
index 76596207795f..1f104f8a24a0 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ecd4de46d6431e9908e2c2533d371c86
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
index f5d973bffc67..f0db04e93e29 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbpdf-font-1.19.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=101b918e177134a787610a09af68d633
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.3.3 b/metadata/md5-cache/dev-ruby/rbs-1.3.3
index c8e15fa65dfa..61e2f3ae0d54 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.3.3
+++ b/metadata/md5-cache/dev-ruby/rbs-1.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.3.3.tar.gz -> rbs-1.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.5.1 b/metadata/md5-cache/dev-ruby/rbs-1.5.1
index 3f6c247e5a9b..8c3d170ebc3f 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.5.1.tar.gz -> rbs-1.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.3.1 b/metadata/md5-cache/dev-ruby/rbs-2.3.1
index f34da5f040cb..d823f1bbe562 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.3.1
+++ b/metadata/md5-cache/dev-ruby/rbs-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.3.1.tar.gz -> rbs-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=17003591e9bda4f47b0837ae09925166
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.3.2 b/metadata/md5-cache/dev-ruby/rbs-2.3.2
index d8e54d1d0c96..47ee6f4232e0 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.3.2
+++ b/metadata/md5-cache/dev-ruby/rbs-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.3.2.tar.gz -> rbs-2.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24281d85286c8d15f39fc365471b3e11
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.5.0 b/metadata/md5-cache/dev-ruby/rbs-2.5.0
index 45679ac6b65b..ef7303f117f6 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.5.0
+++ b/metadata/md5-cache/dev-ruby/rbs-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.5.0.tar.gz -> rbs-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24281d85286c8d15f39fc365471b3e11
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.5.1 b/metadata/md5-cache/dev-ruby/rbs-2.5.1
index 2027c708638d..be40b676d254 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.5.1.tar.gz -> rbs-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24281d85286c8d15f39fc365471b3e11
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.6.5 b/metadata/md5-cache/dev-ruby/rbst-0.6.5
index b330851a91b3..f7f88f28ff3d 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.6.5
+++ b/metadata/md5-cache/dev-ruby/rbst-0.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alphabetum/rbst/archive/0.6.5.tar.gz -> rbst-0.6.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4f9716f2fbaf8d535cccdba11724312
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1 b/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
index 307ebb3337ca..456e8dd5bc6f 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xwmx/rbst/archive/0.6.5.tar.gz -> rbst-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70b0e9af1460f7ec750e549b1ad7197d
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.5 b/metadata/md5-cache/dev-ruby/rbtree-0.4.5
index 9c5b0c7a9ebc..44ba8655487d 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.5
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbtree-0.4.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=089a648cc02e902df19f9c1c548cd344
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.6 b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
index e0a2506fc99c..f87a8d9d77df 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.6
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=57f63b12d7cf1649cdc6c577d25886e5
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.5 b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
index f7fea5bebd8b..6a4482f9086b 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=998797d11bfb720bc70db2dc2bbd4d50
diff --git a/metadata/md5-cache/dev-ruby/rchardet-1.8.0 b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
index da46d595c9c5..b538669df208 100644
--- a/metadata/md5-cache/dev-ruby/rchardet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmhodges/rchardet/archive/v1.8.0.tar.gz -> rchardet-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=64a8662c738034c0db5d70351785a9f0
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
index a7b6f018406a..549c8a42f393 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=75fa15fe82b7b24a61c388d34bc15885
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
index 9957892bd07c..c2555af59fc8 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6fab71383948268b3be0c6d8804f0a1a
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.2 b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
index f4e1530cf534..ea88a703fc9a 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.2.tar.gz -> rdoc-6.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=55cbf6962b3fde35118acbe47a1c077e
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.3 b/metadata/md5-cache/dev-ruby/rdoc-6.3.3
index 48eecf144641..1777c0af42f8 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.3
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.3.tar.gz -> rdoc-6.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=196ce9c2ddbd8aafb1528f55086cba0c
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1 b/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
index fa783c7c1c4f..63b9764ba622 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.3.tar.gz -> rdoc-6.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50ea462811f9b4395735a2d75b7337d4
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.4.0 b/metadata/md5-cache/dev-ruby/rdoc-6.4.0
index 0e2708614292..d8fdfde283f3 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.4.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.4.0.tar.gz -> rdoc-6.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4025db144d7f933e3eb164207bb76478
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
index 7f7741d99145..6d753de23689 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=51e883a7b7fb08cdbf5cb210ca4b6c92
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.19 b/metadata/md5-cache/dev-ruby/recog-2.3.19
index 0ef441640ef2..8281940f665f 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.19
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.19
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.20 b/metadata/md5-cache/dev-ruby/recog-2.3.20
index 10e0161fdb06..7d0b63cf0d30 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.20
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.20
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.23 b/metadata/md5-cache/dev-ruby/recog-2.3.23
index c6445332cad6..aea55342048b 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.23
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.23
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.23.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=edd235fe65a9300dc4eac8d8f2f89013
diff --git a/metadata/md5-cache/dev-ruby/recog-3.0.1 b/metadata/md5-cache/dev-ruby/recog-3.0.1
index 19d108fbe1ff..4e944d1a3356 100644
--- a/metadata/md5-cache/dev-ruby/recog-3.0.1
+++ b/metadata/md5-cache/dev-ruby/recog-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/recog-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=321a0e1e059146e584147eb01d601fdd
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1 b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
index 8d738a95b0ce..026aab196aaf 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b67b27e095a9bf94fbf470a10a02fd5c
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
index 64026191674c..5d1ffb20efb0 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=685ef91dc949d6f361e1fa12943d0218
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
index 4a55e7e6cff8..6267dd4ad2ca 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=63b4550597ecca955a21816d9ebe708a
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
deleted file mode 100644
index aeec096be0ca..000000000000
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby26(-)] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby27(-)] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A module for using Textile in Ruby
-EAPI=6
-HOMEPAGE=http://redcloth.org/
-INHERIT=ruby-fakegem versionator
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d1169572f0755e3702ca3ed987bbb5f4
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
index 8454e16765ad..b966c346b842 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d19dab11cdcab4c58cb4948693bba46
diff --git a/metadata/md5-cache/dev-ruby/redis-4.1.4 b/metadata/md5-cache/dev-ruby/redis-4.1.4
deleted file mode 100644
index 93c55b3a7764..000000000000
--- a/metadata/md5-cache/dev-ruby/redis-4.1.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( =dev-db/redis-5* ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Ruby client library for Redis
-EAPI=7
-HOMEPAGE=https://github.com/redis/redis-rb
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/redis/redis-rb/archive/v4.1.4.tar.gz -> redis-rb-4.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3e8d9f37c34a6d3f3164c6136e23ea28
diff --git a/metadata/md5-cache/dev-ruby/redis-4.7.1 b/metadata/md5-cache/dev-ruby/redis-4.7.1
new file mode 100644
index 000000000000..7b198814ebc9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/redis-4.7.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( <dev-db/redis-7 ) 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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A Ruby client library for Redis
+EAPI=8
+HOMEPAGE=https://github.com/redis/redis-rb
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/redis/redis-rb/archive/v4.7.1.tar.gz -> redis-rb-4.7.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d17ae4f3195e4f0d2f0abdb62b5bdc0d
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0-r1 b/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
index 5b1b9b3382de..719255d81a1b 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f3c1880b3e2d24f2d059d2d1b1090fea
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
index 82e4bc81cc29..bcb52cc99f56 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.3.1.tar.gz -> regexp_parser-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
index 613dd74f7cb4..b75dc856644b 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.4.0.tar.gz -> regexp_parser-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
index 5a6824b1c1f9..f0f2b4123a2f 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.5.0.tar.gz -> regexp_parser-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c25082651af2e80d19cabbe2858eab8e
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
index 9b8d6bf66105..775b7ea51a30 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.2.0.tar.gz -> regexp_property_values-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c06ed112017072deaf3cb21a81bddd9e
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
index 8f0c63c29fe0..a891849eb897 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.3.0.tar.gz -> regexp_property_values-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=802092e76677438847d5b909fdfabe3e
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.0 b/metadata/md5-cache/dev-ruby/request_store-1.5.0
index cc458c56c618..62416a746011 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bcdd9622edcd12f133069d55de5a6d6d
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.1 b/metadata/md5-cache/dev-ruby/request_store-1.5.1
index d8653cb6d546..ed2b661114fb 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=566a332243a4798a7d6f50b56a6dcf28
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
index 84ab41bb8dbc..13ab63104679 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b17c28aca1975321a2a947d25066d908
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 4f3c82e1f638..5530aac4be94 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ce3639c1afb20a4322d9dbdf2bd411ed
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1 b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
index 732ccae603c0..b1e2c3c15af4 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a5242b436a51595322064f3cb0e0005
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5 b/metadata/md5-cache/dev-ruby/rexml-3.2.5
index ed18bb2cec41..ad18b9326988 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=61d450a66eb4a0f557c2ae6e8af24d65
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1 b/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
index d9452b52a7a9..109664ab6b1f 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71e0a973cff5f4b7a0234b65fa7cf32e
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1 b/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
index 8a3ce9689cd6..6dbae258299b 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rinku-2.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dcce8fce8a5c2249454fe8b4f96c05b2
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
index 9f2060f0b440..c56c4e868cd6 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ritex-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7e53c9412411679d385743575ddae45c
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1 b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
index e469a62bb205..15412768cb07 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eaec1f06796d16aac9b8ec8e771f2bb7
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.5 b/metadata/md5-cache/dev-ruby/rjb-1.6.5
index aaac44834b1b..6a17e356a487 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.5
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=59065b77c80789f02468eb3be7792d18
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
index 85869b77a975..90f6957cbbf2 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rkelly-remix-0.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5db4cdf05918ba6ecd4df4c8096975aa
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.2 b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
index 84b9be25b255..278969304f94 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-2.tar.gz -> rmagick-4.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2c6e01a7ebaeb74869cbfbf90a3973c5
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.3 b/metadata/md5-cache/dev-ruby/rmagick-4.2.3
index d98231f75eda..95b75ca0cf2e 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.3
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-3.tar.gz -> rmagick-4.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f608e3c70215df16dd2c0bed3615f10b
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.4 b/metadata/md5-cache/dev-ruby/rmagick-4.2.4
index bee9379784a3..d37f69814fed 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-4.tar.gz -> rmagick-4.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f608e3c70215df16dd2c0bed3615f10b
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.5 b/metadata/md5-cache/dev-ruby/rmagick-4.2.5
index 84a3409f3695..2dee521b3862 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.5
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-5.tar.gz -> rmagick-4.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5494d490d45f321c630c7a7ffb4c56a1
diff --git a/metadata/md5-cache/dev-ruby/roadie-4.0.0 b/metadata/md5-cache/dev-ruby/roadie-4.0.0
index 2b3dad998904..30d2c6515fc8 100644
--- a/metadata/md5-cache/dev-ruby/roadie-4.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Mange/roadie/archive/v4.0.0.tar.gz -> roadie-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73746b558edd2ce80565ce9b2b1519bf
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.0.0 b/metadata/md5-cache/dev-ruby/roadie-5.0.0
index a28d4d999a50..515d537e3162 100644
--- a/metadata/md5-cache/dev-ruby/roadie-5.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Mange/roadie/archive/v5.0.0.tar.gz -> roadie-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a23d5bfd5e131f571871367340e73aa7
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.0.1 b/metadata/md5-cache/dev-ruby/roadie-5.0.1
index 986a5271a52b..9461efbb7226 100644
--- a/metadata/md5-cache/dev-ruby/roadie-5.0.1
+++ b/metadata/md5-cache/dev-ruby/roadie-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Mange/roadie/archive/v5.0.1.tar.gz -> roadie-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a23d5bfd5e131f571871367340e73aa7
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0 b/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
index e2972bcbe591..46b91eccda4f 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.3.0.tar.gz -> roadie-rails-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=affffa42a086f8c89d9768b93383848f
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1 b/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
index 7224bd489ffc..e86aef92f957 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v3.0.0.tar.gz -> roadie-rails-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24d6d4f666c887fb788b560410089de1
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r3 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
index 0ba461468f11..39f546e3e286 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/robots-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfc4424fc32e6029e9b051171ded1b2b
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.0 b/metadata/md5-cache/dev-ruby/rotp-6.2.0
index 26214df5ef25..4fd9883906a1 100644
--- a/metadata/md5-cache/dev-ruby/rotp-6.2.0
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mdp/rotp/archive/refs/tags/v6.2.0.tar.gz -> rotp-6.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e8877f4d28b83aa430db10d606cc65f6
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.26.0 b/metadata/md5-cache/dev-ruby/rouge-3.26.0
index deaefbd6ccfa..06c8e2557252 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.26.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.26.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.26.0.tar.gz -> rouge-3.26.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ceb00bfec03a3474b452dae1a8c2f2b9
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.26.1 b/metadata/md5-cache/dev-ruby/rouge-3.26.1
index 71bc4f23b936..5783609d5ca9 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.26.1
+++ b/metadata/md5-cache/dev-ruby/rouge-3.26.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.26.1.tar.gz -> rouge-3.26.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cecc3b4ce65b0ae66f836318871c055f
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.27.0 b/metadata/md5-cache/dev-ruby/rouge-3.27.0
index e58f8ab828a2..4b194d7f855c 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.27.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.27.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.27.0.tar.gz -> rouge-3.27.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=863625793dbcbcaeafe054c87e26ede4
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.28.0 b/metadata/md5-cache/dev-ruby/rouge-3.28.0
index 312db2752ba3..b7234beb43e3 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.28.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.28.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.28.0.tar.gz -> rouge-3.28.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19d830e9c03e7c6d8036bd82f932ae0e
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.29.0 b/metadata/md5-cache/dev-ruby/rouge-3.29.0
index b3539993774b..0719adedd866 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.29.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.29.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.29.0.tar.gz -> rouge-3.29.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=600881744b83af2f95404915061781fb
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
index 712a073667d9..20451d62fb6f 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.0.tar.gz -> rqrcode-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d5bd3e045dcd64f9f8316fc5221bdc6a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.1 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
index 93446bbe2a38..dfe43b2fff80 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.1.tar.gz -> rqrcode-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=813c729dffccf48697237b754a70407a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
index cf11143fbca3..578b8dd6b4f0 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.1.0.tar.gz -> rqrcode_core-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=712370465b1f5ba80ffa02146c9e11ea
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
index fd2cc5b114dc..c32a87cb5adb 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.2.0.tar.gz -> rqrcode_core-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=11af1dd5f50fc7695dec5c2675ed075b
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index 7c237f76ef09..b6c31c852324 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=199fdc91a6b385d693d1228db43f6cf3
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.9 b/metadata/md5-cache/dev-ruby/rr-3.0.9
index 2add373d286d..a3b0c1c91621 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.9
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.9.tar.gz -> rr-3.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6fd1d4f5c46c25171a14bb8a8c9e7744
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
index 753bbb026009..58be7fca2d3e 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fe0d95eb9691219bc41a2cad523c8e26
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 0f2ebdc06647..900fe89a77e4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fef1a60c55e1448a1b28fcd1d57b7889
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index 8cc59856786e..3838667c60b4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=137bb00ef315c630e5a2322e3aa2a0e2
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-3.11.0
index 95e173a59f47..d63ba5105365 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9dca351aedfa0c554d84b6ca0c49f640
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
index 49ae9dcca3e3..5d7a949498e6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-collection_matchers-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb1cee7f2e759fbf65e5ec66a55f4daf
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index bfb8b81fa4fd..83be05022dc2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=28823ce7f8e14c190b19c15eb48ea183
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
index 3dcadb4b6a8c..362d86102813 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.1.tar.gz -> rspec-core-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=807f00c65b934180678c1dce850cb5ab
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
index 4404dd78ef4e..aa2f6146998f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.2.tar.gz -> rspec-core-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b6797619d828eea36fc1f42a0f5c39fb
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
index 3efe6ce4d3e8..c65cc4e4b9fa 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.11.0.tar.gz -> rspec-core-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b252d52e776b8fa47586b718ad36dcb
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 75e797f9ede2..5cabd6b0ecd6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=601a7409a2e615602e47fa6f036031cc
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
index 9b01f0d8be86..4584c389f598 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.1.tar.gz -> rspec-expectations-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=55fc1016d9bda076c9128805127c1364
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
index 59c2defee075..e18cd82be21d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.2.tar.gz -> rspec-expectations-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a591d38d3ec412bcaeae88ddbfd0fa5a
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
index 18ebd3b3b12d..b87dd2a8ac42 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.11.0.tar.gz -> rspec-expectations-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e600c706c4fd4ee630e10a799a14b88d
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
index 017a93953c42..65475f9a4b03 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a66c4e93eedab8221e7f57289f5fa588
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
index f9bc60c49315..818425111f4b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=12dd4fe7b772e15b87235111ae557fe1
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
index 8f4596e28e0d..ec52536f41ce 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b48093cfbe967f2aa5dea162ef2bee15
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
index 03f912e3953c..297836225eed 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.2.tar.gz -> rspec-mocks-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d510b95abeedf47cccb398e66a297893
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
index 1992fddf662d..d643143ef010 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.3.tar.gz -> rspec-mocks-3.10.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c9160a76dd10ec29915cd9064a47d8ff
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
index 3d1dd41acda7..ae53a4b84ad5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.11.0.tar.gz -> rspec-mocks-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5a8849f45903a007df13dd0f68ceac0c
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
index 2fc8fb3fbbea..af065fbae98c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.11.1.tar.gz -> rspec-mocks-3.11.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5c0879197ef599bb4448615f0acca5fd
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
index 9bb943cdaa1b..2180f923d564 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.9.1.tar.gz -> rspec-rails-3.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e6fe0e6b3ba349479aec4da0c58cd611
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
index 43837e773b6e..69ddf6d0b8fb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.1.2.tar.gz -> rspec-rails-4.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fb64696049e4f4768219a6ddea99c670
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.1 b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.1
index 5838b91d58fe..1c92dbdf8160 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.1.1.tar.gz -> rspec-rails-5.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b6f542e595e8419cee63189ec8aaa51f
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
index c24e222925f6..1808b441083f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.1.2.tar.gz -> rspec-rails-5.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c1165ef64f72a21e0c081215d8117892
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
index 88cd03b0197d..ce7f6e92baf5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspec-retry-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=125efda5f6f5f16fc36d57e07deb0623
diff --git a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0 b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
index 717cc4b91a36..4b2071114c48 100644
--- a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
+++ b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-stubbed_env-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=beb863ffaa7ad3c296b03475147a10b0
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
index c46e368a89ab..a717d143f465 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.2.tar.gz -> rspec-support-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dcc6b86ad3c80909dd819b0aaed2dca1
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.3 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
index 535ac1e817aa..44bd57c8d760 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.3.tar.gz -> rspec-support-3.10.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5ae7fd75d501e1a86c901376dc1bdda0
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
index d18444a0766f..e02da38273cc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.11.0.tar.gz -> rspec-support-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ba56cfcc1b05cc3462fd7591d21b8005
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index 89386b180113..cc2d7a181fdb 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5776a650ac7a6b69e652ee104ab2a99
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9 b/metadata/md5-cache/dev-ruby/rss-0.2.9
index 5172454983c8..12ec0c3eadfb 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d87ddb125c91e831b8b9f10db3965a30
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9-r1 b/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
index 69a3c266bba2..7c28cc27311e 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aff0f078a7879435eab0cb03500a4ebf
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
index e3412dcf0e28..a1ec9a0e1c37 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d81abe5f2faeee8649fe2725faeb8f0
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
index 06c137f4c660..900d0c6d522c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=feb4efcf9a563557e95773e9a5eeca56
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
index d9043b668a0f..5f46c975283c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1c0b85558c58146026c355d505176568
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
index ec3daad003f6..0889f93d0baa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=9219ec1a7dc03fde5ada071732075907
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
index ba40961eba55..e64b7ae85223 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6a3add72a981d0c7c27edd7711597709
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
index 36110e002006..8652d67538a0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=d56a4875b3b2cf439dfeeee122300c76
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
index a0e0dbb2d214..292ef8796baa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=7e8e1e9562bccfe51d2c7be4abb02a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
index 52313031c427..e4a489884743 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2fb03f2780a7d0562a44408aba51649b
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
index d714ff7013df..2751a2e33cc7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=996030de843311b6f969f87f62bf4599
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
index d1ca14bfeb1f..3ecf551f744f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.10.0.tar.gz -> ruby-feedparser-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f8dbaa35a9bef87e48c084f1b2d2dd15
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
index 2e048f1c552c..12adced635eb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.9.7.tar.gz -> ruby-feedparser-0.9.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=264e018e9ec1a89eab56c848ea0b849c
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1
index 29af7e7fec6f..ff55850cdac4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=919114c748b7072000d732c25c87e33d
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
index f02eaecd01de..eef259d3bfd2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=744ca8af0c5d4faec9962798f7cb0c41
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
index 07f7092b1290..a8e90af089e4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=26fe993c21f8a7b71c848ce13fac91b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
index e531b5962d23..7823d7040f14 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=59b84f84f88bc8e2d6b2b2b38bf4b2ec
diff --git a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
index 61c97f08513b..2d2d9469a27e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=436b0c157ef691cb85f11ff891ac87c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
index f9fe74e041cd..42b3a00127c1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6e72fd57dbce3c2ee1acee69e3faf5ac
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
index 57a90cc964de..2c2d9dc5945b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aaed340d7094b99bee8384c39b02b180
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
index c0346d3c2605..924fdea70899 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4d8f6b3fc346a9e2620b1e06ad20d2a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
index b7ec7ab55b2a..6bb4667eb5df 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8db7f02c1f2a5b840b10f4688ebef37
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
index b7698f2fb3ea..7054c06394d4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b897748610054b52821627dfd27a9d42
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
index f01cc28362c2..5040b58b7fd6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2147316dcb5638edb849ac578cf43674
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
index 1eaa0310ec7a..fbcc5e2a967a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/ruby-atk-3.4.3[ruby_targets_ruby26(-)]
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3d5b4e5787b6e1d9d28d22d80fdd4caf
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
index 75329b80789c..9d719be16719 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=0f4b13635743dfd7029cf43e979fe374
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
index dd6a4fa9a24a..34696e47e94c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1d98da586b794237b0157ed1b98d55da
diff --git a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
index a135ae9fe044..b4d70a72118b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=9e3f7cd4d38dac5a178dbd378de3ed64
diff --git a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
index fc09d808259d..264520d35e28 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d73b8eac709094cea24a7c1b26e5b7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
index 6b4dd25513be..eed07214b642 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=3fc516fb7af14974e87d625ddcf5d5d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
index c4062194213f..84687b63d514 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=b4ee6e052aa3d19b097b4fefe77d26a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
index 62a19d1b57ca..818ab517430e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=646a0bee3ee7e9ca46d0cc690274a57c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
index 790897f806b9..c7b5d03eb5c8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=e69f11f409daf1421dfbc8e1b29e799a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
index 9ce10871f157..d3cae8d441b3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=5d53605dfd3d799272e55f0a838a6914
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
index cad9a9855b34..796a05d045d9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=922d5dedca169523ffca11a6014372e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
index ffdec2fa734e..fbc3f761fb55 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-hmac-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f9edeef5cf9c63a52c6578c88d06d030
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
index 752bc4d1160e..1ec07aa20e09 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4a8a09dba18a8d29c301c9672914957a
diff --git a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
index 8d77fe33dc2c..cd0995379c53 100644
--- a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ba249c61dc417b9b610b28b0b245856
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
index b037929b4f2a..7f56eafe24ef 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.1.tar.gz -> ruby-macho-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=87c70c9a5cf1e1648d7997c270ef58af
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
index eb379ce95272..f93335c5a4c9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b33f20892dae6e58c6a393b35766cbc
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
index bb5234624674..a3f582094eca 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.0.tar.gz -> ruby-net-ldap-0.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b7fabed627e9780b79994c86369f7396
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
index 70c8a9631435..772310fc0c4c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.1.tar.gz -> ruby-net-ldap-0.17.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70822af19b7bacd82e00e57b36aae3df
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
index 77a56f1f1876..b4bfdc6bf515 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99999.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf3d95117a4d9840026abfc3d3b6db88
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
index 8152311eb174..9a928f967fba 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=742d39571627b5172f4759d44f6d4566
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
index 5aaa828c68ad..176d788258e9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c101cfd05978a21222e5ec820d31c770
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
index 73baa2850900..9651aabda903 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-oembed/ruby-oembed/archive/v0.16.0.tar.gz -> ruby-oembed-0.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad2ddfef37f29425d661b2b673e208df
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
index 3bd7f3a17715..6885c184bdd5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-oembed/ruby-oembed/archive/v0.16.1.tar.gz -> ruby-oembed-0.16.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad2ddfef37f29425d661b2b673e208df
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
index e6d9818f9e18..b7c8f9e19b0e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ole-1.2.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=881bb779616ebde1dd4446b28cab42ff
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index 227ce9ba509b..19badb7c2c6c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad9bdbe19cbf0ef3a818fafa61c6c688
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
index 3a6af07794b4..7263172f133f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2159d5598b0a7e60c9404564a012ddd0
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
index 784d834b024b..115e0c77e644 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.9.2.tar.gz -> ruby-openid-2.9.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=351f862d451accaa35a98c0a8307a3f4
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
index 36b585fc8e50..d5657b00ca05 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=99f4512f8465f58d9413f86d87c1a1e8
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
index fe6049a66a11..fcc91a05e4da 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=01cd67de36d38daf4e54548f847ee0f1
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
index 862d686d7b85..72b95a3b7eae 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.3.tar.gz -> ruby-prof-1.4.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b3a42d7c8bc284ce457c8d2291de42bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
index 668adac7a93b..6d81fb033f27 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.10.1.tar.gz -> ruby-progressbar-1.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c4c4f3ffbc2bb34f76e0a2672f0669be
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
index 66780d947c27..78152b723eff 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.11.0.tar.gz -> ruby-progressbar-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9c3aee56b6f47d2533f195954881605c
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
index 9c24680668a7..5d994810009f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-rc4-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d39393914baeb3bef244dfb4ce9acb61
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
index e4dcf691ca85..7dd062ac3cf8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d51bce5f059f701d11494097a7b821b
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
index d880b2c83b28..72516c680f00 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=37379b365a9c4867be765ee58b9889bc
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
index 56a1e9815953..1d5ab7b7c208 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
@@ -12,5 +12,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5[joystick] truetype? ( >=media-libs/sdl-ttf-2.0
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0c00946591dbc61b629822b8a84823ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
index ea88f0ee2222..07f9ff417a9a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a6820e6300426412dea841a8ffe7abb9
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
index 94679b53f325..c28b812002f7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19f8cd0efe15d3345808461283c6ab7a
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
index b82121ac2e96..775bcc171f89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15a09d58bcbb83b56facc4808ad9a222
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
index 7c4501d59fff..3effd226cb9c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4ec0594d0db49c5d19fbd13cb7f6f7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
index e3a41172d84f..7b06c725e3e9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b41182ceff5e4a364991a6e9473a70e
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
index dcda31bc5f9b..b46800dfb1f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8a6c2b02ed5cd71552a342cd01a34aab
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
index c48e5e0d862f..486bde58dad3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5bad87adc3ccb63ac7f3d1546a7da8b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
index 341c9a2ae167..cfcd79d0e33a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=443bb38ac0e26a7f91261e55fa094e8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
index 734266a332ba..2deb16772d78 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=f240019b3280cf236c6b754d5d8a79a0
diff --git a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
index f3dd6ef82d39..281cb9a5edd0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-ng-gnome2	644503b6d0bb77d25630a3a0af7487d7	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=aaae1c7c85e4fefb9b4b610bb22961af
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
index 5fea5a459179..4176f6cff93e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-xslt-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=15f1656fcff2be4439f6440daff9c9ea
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
index a6e426367192..12e642e62f2d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-xslt-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8127a3ea323c224cf6321e6202ab156
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
index c74a6c0f74eb..6b787f2df83e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-yadis-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=098cd90c8ea6fd203627d73e42459724
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
index 52b44f0e48b5..3ac964f26db6 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1355e930bf7d92562ac015e1b407867d
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index 60a270f0d910..111b541d7606 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7674988ff5eb1ec4bbc8e4ac8d1772ed
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index cc31ba03f88f..7eab0a97fe6a 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56637e663920ab7a21249a32a90c0614
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
index 2b6a425f5c5d..32520a1854a8 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby_gntp-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=75998a660e2b25181574deac1c94519f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
index 2246ac7e3d28..6b05d7e61bc4 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.18.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7f0c08561542bc5d5c1c8a5fb16b936b
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
index 10e2bb41a38d..43d26899b021 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.19.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=70718e2b82121b93a19b159d7ed7ace4
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0 b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
index ac170f5b7948..22b07314b359 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ruby_smb-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1d43308e4af2206c5cfde51f977e67a9
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.3 b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
index ed87eda98e37..ad298a88209e 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad310e7082c46e566cdc5d6dd00a0c56
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.9 b/metadata/md5-cache/dev-ruby/rubygems-3.0.9
index 6f53386ccc11..323f0ba99958 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.9
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.9
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.9.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b20d97269aaac00463d81533fe429123
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.1.6 b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
index 5bcd2a160011..d7e362f2586b 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.1.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6cb2168c0cbbdaf59560ebd0d9b5a2ab
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.14 b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
index f7e97b225dee..188494b2f6d9 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.14
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.14.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b6c3328155b1111f2b3a61cee7db604c
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.22 b/metadata/md5-cache/dev-ruby/rubygems-3.2.22
index 3f846c77d97a..42f3098169d1 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.22
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.22
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.22.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=484cc948c608e1e0e743051327d9b9da
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.33 b/metadata/md5-cache/dev-ruby/rubygems-3.2.33
index 2ec596550555..09296d93977e 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.33
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.33
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.2.33.tar.gz -> rubygems-3.2.33.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bb268c57bc7d5370f574a6fa1e71093d
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.3.8 b/metadata/md5-cache/dev-ruby/rubygems-3.3.8
index da883501ee8f..c3cefd116d8d 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.3.8
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.3.8
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.3.8.tar.gz -> rubygems-3.3.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4bb1c1afc3c32cfa921f8d7a6bf0eb9d
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
index 334c80035479..d8a2b094085b 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubyntlm-0.6.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e98616e2e5a68a631f24c76bbe3937b3
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.1 b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
index 278dd9a0fd66..591dc0b0280d 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=567c94c1f9bbfee38908061e516243c3
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
index 2b5d6ec05331..413816588bac 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d5255bb4c95ef7f3ebe9b2139cdd9fa3
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
index 272cb32e288c..598df89eed2b 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-cli-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cee6941d7353f9491c03767f9491921d
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
index 88ee53243c0a..96265c560675 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytter-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45176f57dd129772307f22e701b73d12
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index caed6f0d046e..647a14eb6067 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=35c733613a2942527668e0d869b3a725
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
index d27f20696c2e..0c238662fe2f 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=acdbfe2d7921bb29052470452270b7e8
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
index 15b8d14f546a..b729583cbfcd 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=abc76e97aa062fe5fd38fdf48b70bc58
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.0 b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
index 14a3c8fdc1ee..a4b082e082a9 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-6.0.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.0.tar.gz -> sanitize-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b1b20828441bda907ff510875697ecc8
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7 b/metadata/md5-cache/dev-ruby/sass-3.5.7
index 6a05713ad31e..10395fae19fe 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bfd69e750c0383dcf2ecfe6cd8617ead
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1 b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
index 64d171f0f37f..db5352e81388 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e6a1fd6a0e7f49119dcfa24d034020ff
diff --git a/metadata/md5-cache/dev-ruby/sass-3.7.4 b/metadata/md5-cache/dev-ruby/sass-3.7.4
index 2fc186ccac90..dde325157242 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.7.4
+++ b/metadata/md5-cache/dev-ruby/sass-3.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.7
 SRC_URI=https://github.com/sass/ruby-sass/archive/3.7.4.tar.gz -> sass-3.7.4.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9683b2d56c2d5946e64233dc4440d34c
diff --git a/metadata/md5-cache/dev-ruby/sass-3.7.4-r1 b/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
index e0bba7b982aa..81c93f99cbcb 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.7
 SRC_URI=https://github.com/sass/ruby-sass/archive/3.7.4.tar.gz -> sass-3.7.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2cdf1099496cefff15d88866454a1e71
diff --git a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1 b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
index 2862d341fb2f..f10bf035d450 100644
--- a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/sass/listen/archive/v4.0.0.tar.gz -> sass-listen-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=af31c7846bb800701207fd1b4339a5c9
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
index 9a42b0c05bc2..5d586a2bf9e6 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.8.tar.gz -> sass-rails-5.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
index 1999e6824a53..b401d9ab50a1 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=5.1
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9b8addb82a559e46d1200c849f29e53
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1 b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
index 0dd1ed0e97f7..9e0c091c5733 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ecc1e164403037d964982506b0a7bf1e
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
index eba1d62a3f87..2d063869779a 100644
--- a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45c3693a98e13f8305c0a1e822893d24
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
index 69b2c18492c9..815140fef577 100644
--- a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2efe39ca01413dd90049f00776584bb9
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1 b/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
index 1ff28cceb64b..3d0211195f52 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.8.2.tar.gz -> sawyer-0.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc98a47d777d105639d9319cf4778742
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.9.1 b/metadata/md5-cache/dev-ruby/sawyer-0.9.1
index af5dae1cbe1b..0edf9196e725 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.9.1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.9.1.tar.gz -> sawyer-0.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc98a47d777d105639d9319cf4778742
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.1.0 b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
index 0bd2e16e6924..3623db2426b2 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-1.1.0
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sdoc-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=00e362d96d4025f769912c721d313e02
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
index e10db1b394ef..5597f9570a9d 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4bc1f4a87adaafd9344057feddb4ea30
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
index 7e963a4c66ae..541633b42b67 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-3.142.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0dc5c57347aa3d8c1f8757a67713d0a4
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
index f12be6139abe..2c1b593b5302 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-4.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e9bb51fbc01f52c78586b87a7e95ff40
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
index 8eab886a7f07..ec4e931c6faa 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=43f38d329fc3025c2647143d0b01fc72
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
index c2b2a513b317..c1e0d6771b27 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ebde591c66693df6f697bd1b60bd609
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
index 5813952efa38..1e2976e39c25 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=81975a18a3499300418db602c7611b81
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
index 5dfc65fe6139..d6f8d9fbff78 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a1535a114b2fb5a586ffe6744b793047
diff --git a/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1 b/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
index 3adf4396c91c..9f8ba8acc954 100644
--- a/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/haf/semver/archive/v3.4.2.tar.gz -> semver2-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7961a06e7ba336c34da1d29a6a8895db
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2 b/metadata/md5-cache/dev-ruby/serialport-1.3.2
index a271e94496c5..79389cd9a7a1 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.2
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fbaeb95de8de4fe23d80f4766c5d21de
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.5 b/metadata/md5-cache/dev-ruby/serverengine-2.2.5
index a37685cb79c1..228054aa3730 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.5
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6de8a8659af658aa294ea2b0eb20ee59
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.3.0 b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
index 199005160fc8..3d5089e03cd3 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.3.0
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4cf4b01f15e0900e8840a8c77bc2fa1c
diff --git a/metadata/md5-cache/dev-ruby/set-1.0.2 b/metadata/md5-cache/dev-ruby/set-1.0.2
index faef5c865ea6..c616adaf76b8 100644
--- a/metadata/md5-cache/dev-ruby/set-1.0.2
+++ b/metadata/md5-cache/dev-ruby/set-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/set/archive/v1.0.2.tar.gz -> set-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf6bed9f0dd53ae076b80d6686e23340
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
index 40cdf7cd71eb..8214f70b1258 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/settingslogic-2.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b167c6f0c61e4fe171c3646d4ff4827b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
index 36d7924954f7..0f88bcda8288 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7cb61dc31721aa8aae99cac362775bb0
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
index 127bbc4640c9..14934731960e 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=66cdb177d2c42aa0a43ba270d60f5b3e
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
index 58d5be9cf813..d1647fb449e8 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b8eee06afdec9e89b3f5a0bc230f82f9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
index b97ced93c982..cc1f80008a2a 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dcf55af8d4910477ae6f707daf8ca412
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
index 1c45c9c769cb..33ce0a9e8dfd 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=901683567b6c5b1df7f9d4c73103c823
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
index bfd81786a862..47b60fceaf39 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb3723f905b160853347780fa3584039
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
index 382186355909..49c08fb50b4c 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shoulda-context-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b13e429f9c1245f921ab8f34a4f3a485
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
index 1b8f20d24830..0bd366166075 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a999d9318db86cc7ef2a30eab5149024
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
index d30e4136ab9b..f5bdd03cc892 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.4.1.tar.gz -> shoulda-matchers-4.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=499ac189158d1e67941696db0ce5abe9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
index 88bead36af47..f91cf57d897b 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.5.1.tar.gz -> shoulda-matchers-4.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f84d4d2a36244f17502d7e6119d13f14
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
index 86a109679e99..71ad49f27e19 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.0.0.tar.gz -> shoulda-matchers-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b4ff847d63c4ac1a124390fc349a37f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
index b58c819743d0..a96ccb463389 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.1.0.tar.gz -> shoulda-matchers-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4a63d89a82027488b4809d9a5d1fca85
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1 b/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
index afb3f3af1f28..fc1560024ee1 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigar-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=98a921a3700074a12db79124c1e4973b
diff --git a/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1 b/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
index 48505d7c1c05..73c3d98ea755 100644
--- a/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigdump-0.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2920a2abf2022d90a2a9cf340a480606
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
index b2007dd7962b..bb87b0eed0fd 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simple-rss-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=be28eefbb91f55b31de1702a84f04ec8
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
index 5a34b2b9aced..f79ca6c71185 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simple-rss-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=92cfce644765065749f66ea63b88d803
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
index 3f2a2b395c59..b71a59f18789 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=955f1382208fa0ff09e6a73bfb5f9bec
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.1 b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
index 9a3da9070e57..1b851cd803d1 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.1.tar.gz -> simplecov-0.19.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=af9f88838012fdb0ce29f2339d7daa3a
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.21.2 b/metadata/md5-cache/dev-ruby/simplecov-0.21.2
index a4a794dee40d..a071e525d291 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.21.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.21.2.tar.gz -> simplecov-0.21.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=221401679f56819abbd97c11341799b7
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
index 9c43da008972..eb64cf97302b 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a1c4c0055173cd7aff21a8dcac647341
diff --git a/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4 b/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
index 5e05b4f99a1e..0b017f87a777 100644
--- a/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
+++ b/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simplecov_json_formatter-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cb5c07a794a974a1791d96888eda7fe8
diff --git a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1 b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
index 2fbf9f31de40..4a58579a18db 100644
--- a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmriis/simpleidn/archive/v0.2.1.tar.gz -> simpleidn-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c2f8bc1d560e6e0385989f500bd3e5e0
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.2.0 b/metadata/md5-cache/dev-ruby/sinatra-2.2.0
index a312ee6665ab..be13185118a0 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.2.0
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.2.0.tar.gz -> sinatra-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9fbff36fc9a75317d2e6a6b95cc3bb89
diff --git a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1 b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
index 077676b7851c..2cb75a88888b 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sinatra-partial-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=769fef976c7ddf4aa91348a98d518004
diff --git a/metadata/md5-cache/dev-ruby/singleton-0.1.1 b/metadata/md5-cache/dev-ruby/singleton-0.1.1
index e3afbc1abf88..83dcabda7a29 100644
--- a/metadata/md5-cache/dev-ruby/singleton-0.1.1
+++ b/metadata/md5-cache/dev-ruby/singleton-0.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/singleton/archive/v0.1.1.tar.gz -> singleton-0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5b8ca74e97b182be6eeb9d955c72dab8
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0-r1 b/metadata/md5-cache/dev-ruby/six-0.2.0-r1
index 7b73dd52db39..f7ff70dba0d8 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=281eba4c482519bf9de45c54a9769631
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
index 59c255c4bf63..e2dd343b2d24 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/slim-3.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7a3b6d0e30b3b7b3ee5a485f37b8a3bf
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0 b/metadata/md5-cache/dev-ruby/slim-4.1.0
index 88cb6e0a2d11..f1b716aee76c 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c75fda06fcc6fb7f2f88ccc0ad60f8bc
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
index a52b90ff2b9f..c82b6c5497bd 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=96274fb19a92af4a17e9bd5a94df40dc
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r2 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
index 7efab10e3895..9cc0e5eb01ab 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=99fde52b4cdf44cfc0e1d897864be3fa
diff --git a/metadata/md5-cache/dev-ruby/slop-4.9.2 b/metadata/md5-cache/dev-ruby/slop-4.9.2
index 4d8f5b5a0c5c..752d0f3ef039 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.9.2
+++ b/metadata/md5-cache/dev-ruby/slop-4.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.9.2.tar.gz -> slop-4.9.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2870aff192f3d411241910c5b8f0dd06
diff --git a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1 b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
index 82330e1ff162..3486a53e8010 100644
--- a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/slow_enumerator_tools-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2e939f437d3f13ba7944d993d3fe07aa
diff --git a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3 b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
index c818f2b4f907..3e751b6345b9 100644
--- a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
+++ b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/knu/sorted_set/archive/v1.0.3.tar.gz -> sorted_set-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3380235e4ce5f9f88145df5f012c1604
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
index 50011b644df5..678c9363f710 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sourcemap-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=37f6ab541abc577546f162679daebf83
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
index 4015ab24fd29..e35af9f2ac34 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sparklines-0.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ce31d5fb2c235bbdb75930905f5becbc
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0 b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
index 8e46d31e4fb0..66cd6009a4e9 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.3.0.tar.gz -> spreadsheet-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=038b1cf49615233e39c253e359d300ea
diff --git a/metadata/md5-cache/dev-ruby/spring-3.1.1 b/metadata/md5-cache/dev-ruby/spring-3.1.1
index f77473314fa1..206b13be73a5 100644
--- a/metadata/md5-cache/dev-ruby/spring-3.1.1
+++ b/metadata/md5-cache/dev-ruby/spring-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v3.1.1.tar.gz -> spring-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f5918975093107e7f6622c7750068c86
diff --git a/metadata/md5-cache/dev-ruby/spring-4.0.0 b/metadata/md5-cache/dev-ruby/spring-4.0.0
index 7872e409000e..861493c07abe 100644
--- a/metadata/md5-cache/dev-ruby/spring-4.0.0
+++ b/metadata/md5-cache/dev-ruby/spring-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v4.0.0.tar.gz -> spring-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f0c55b58e754cc30035b3d78f0291af0
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
index 98e479f3e411..d165450fb0b8 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=6cfdd1fd8bba97046a603720d7f66788
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
index e143145fec7c..b6f13a437bad 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=5f72ba992338d99644811a061e5aa1c3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
index 5457541080c2..604235ec6b0a 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4c76576cfaaa4f21d17a12ca5974f273
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
index fa34efa6f187..44243935c3c1 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6046e4a518378e292889724241a933ae
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.1.0 b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
index 812455bb9eec..8b1e449ae790 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.1.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.1.0.tar.gz -> sprockets-4.1.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9efc7003dd1d9b6c8f871952e39c152f
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
index bbbf68b77095..08a987396d82 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.4.2.tar.gz -> sprockets-rails-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6782a576fc997e635395de3c71e206e5
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.2 b/metadata/md5-cache/dev-ruby/spy-1.0.2
index c83736b851af..dddbd24097fe 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.2
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a47804be799c26cb9aa18240b6a046c4
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
index 893c6e1ff2b6..fd3cbf413481 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=64b3f0d88e79231d21fc967dc1e03eac
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.3 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.3
index 14e5622ff52d..83e11189aa0d 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.3
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a1211e680119073a9e4022e823299789
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.4 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
index 8b7dd8653e2d..854f7be03324 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3a058cc0a1c68819d1fd4c788080b749
diff --git a/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1 b/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
index e964821a0d2a..6269e1dc0edc 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkey-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71cb8b0850341534a8675c08102a21ba
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.2 b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
index 8751074ba931..4a97d675562c 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.2
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=46e490d0a5e2abf52593dd7a55afb1cb
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1 b/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
index 76a7f7fe4541..7a0b6bd00dbf 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=730aa30aa9a80230370ce788a10092f6
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
index 40b576263b7e..e5c44170b967 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/state_machine-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c2091cea27413f3e7fb9e4cd3497229c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.10 b/metadata/md5-cache/dev-ruby/stomp-1.4.10
index 30a9433ae059..30b703ecc471 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.10
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7f34f9cc6b48983582ece42901738804
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.9 b/metadata/md5-cache/dev-ruby/stomp-1.4.9
index e9cdd1f8ac49..f34d30cc1a95 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.9
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d60fc2a6ec522ca1da38300076285184
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1 b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
index cca003c05269..1487a415d1e1 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e509d3e5ca85150bff092137ea9534f
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.1 b/metadata/md5-cache/dev-ruby/stringio-3.0.1
index a5761df938a0..6dc2a89fd962 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.1
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.1.tar.gz -> stringio-3.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0c2ce7047f2d6c840c28a9e21bfbabee
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.2 b/metadata/md5-cache/dev-ruby/stringio-3.0.2
index b8fae46f78e1..140fca68022b 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.2
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.2.tar.gz -> stringio-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0c2ce7047f2d6c840c28a9e21bfbabee
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1 b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
index d8ad0a9e391c..f6b5bdefa894 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dbbf90ba84c9e6b6e44bf94861c51168
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2 b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
index 826f7450f2e3..872c7e1258c8 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a608f4893eb66c42aa1a1748e4dba581
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.1 b/metadata/md5-cache/dev-ruby/strscan-3.0.1
index dc31d3099265..27cc4e3445c4 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.1
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.1.tar.gz -> strscan-3.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=efea4b65d395ab8e8b15b318acbcfe0e
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.2 b/metadata/md5-cache/dev-ruby/strscan-3.0.2
index ca58d5ca1ef9..6d0f5a2f52e4 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.2
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.2.tar.gz -> strscan-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=101f4da8c078d2bc33c981c2e44ad596
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.3 b/metadata/md5-cache/dev-ruby/strscan-3.0.3
index 7565f4a74e00..ccce8420e11d 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.3
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.3.tar.gz -> strscan-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=101f4da8c078d2bc33c981c2e44ad596
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
index f726b1706d10..a258394c5cc3 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ef0697c5a4a8f0d0c46d324bd882e1a
diff --git a/metadata/md5-cache/dev-ruby/sync-0.5.0 b/metadata/md5-cache/dev-ruby/sync-0.5.0
index 1f2c6da18aac..87a56d960d69 100644
--- a/metadata/md5-cache/dev-ruby/sync-0.5.0
+++ b/metadata/md5-cache/dev-ruby/sync-0.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/sync/archive/v0.5.0.tar.gz -> sync-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4ce39a74dc4d2a1e61ce4557abafde1e
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index b09e8fd22ea5..6a1798f641fb 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6cda2e34ea8422a2456d067420942cd7
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
index d0fe99d3b741..2210e566960f 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27b5ab33eb03148b1d7827e8cd433142
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
index ef54bfa90203..da1b047cf7e2 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e6034720a827764567678dc56b961767
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1 b/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
index 5e0cf7c665b5..d1acb359e669 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/systemu-2.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d8f1986f0db11e1e54564a6cefd40267
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
index 6dfcd2772433..96bb166675e4 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=592dff91fa0ec4e28a4d22d34ad8fb0c
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2 b/metadata/md5-cache/dev-ruby/temple-0.8.2
index 421187a9dd4b..1de816835288 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.2
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=50dfbe74ee1546c67aeeb54eccbcd922
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2-r1 b/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
index d4c9c85a1f14..4f40376f2b2d 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c97f5cea3f8b158facb0f87c67af5898
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
index e20eed66b1c8..bc7288944f54 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=63113c7b89c2e0e98e232c918ddbb571
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2 b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
index 2e07f39eadde..3a8cb42db5a7 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tj/terminal-table/archive/v1.8.0.tar.gz -> terminal-table-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=967020fd52f63c91fab6adf880be79cd
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
index 578f280bd02d..a46215f0aab4 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tj/terminal-table/archive/v2.0.0.tar.gz -> terminal-table-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d2d7c35e775a336621614288a946eb85
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
index 291ad90623a7..c05371e1d9f2 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.2.tar.gz -> terminal-table-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=96c60fca89653bea385fc21bca372134
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.9 b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
index c36015f846b4..a7d6b2394d9f 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.3.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=878f4c457bc50b14089e698664f917b2
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.9 b/metadata/md5-cache/dev-ruby/test-unit-3.4.9
index 828048792324..ceb1942b4ff9 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.4.9.tar.gz -> test-unit-3.4.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ebed982aae8f8339410f530a853ac07
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.5.3 b/metadata/md5-cache/dev-ruby/test-unit-3.5.3
index 81e1ea3ab42b..47ca968d96c8 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.5.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.5.3.tar.gz -> test-unit-3.5.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=04e96ffce5b030088c26e338d7c84f40
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
index 2c4b57ddcdf6..e3e3498b712b 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4becfc97cbd046538e5b047b737942de
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
index 25897d46546e..335a034a345d 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test_construct-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb789d8da7eb39c896c52823ddc85988
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
index 24e5d72c405e..0e8fe1f202f4 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/archive/v0.0.6 -> test_declarative-0.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=821855c266d37275689ef664319049ce
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1-r1 b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
index a395a1000119..2e65ccdc6efb 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ea49b63bb5383062d831bd09079748c9
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
index e3c7ff56df1e..119184e551ff 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-hyphen-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8e92aba23ce886771ad8a01a4a285360
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1 b/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
index 4b4f1c14d1cf..4a3124fdce49 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1503fb45cfdd723e74c292e37289dac8
diff --git a/metadata/md5-cache/dev-ruby/thor-1.1.0 b/metadata/md5-cache/dev-ruby/thor-1.1.0
index 67e6a346e56f..2f8a51aaa418 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thor-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.1.0.tar.gz -> thor-git-1.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3800a0f895972940fa80e51fb6c091c4
diff --git a/metadata/md5-cache/dev-ruby/thor-1.2.1 b/metadata/md5-cache/dev-ruby/thor-1.2.1
index 5c511f800225..c264fb7b5b1a 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.2.1
+++ b/metadata/md5-cache/dev-ruby/thor-1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.2.1.tar.gz -> thor-git-1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e6d7d08e0d77d39178bad867a8a3bea
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index eeac44cfba3d..f74513955797 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=91b45c842260318ff536ae57fdd0885b
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
index eb8bf195989b..57cd4171bbbc 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fde4e861d96e48f7d3cea8462a14008a
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
index a1c07a4b52f6..88e00fc7ac09 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy-ext-0.1.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9e2b45e2bc1eee631a09fed91e39e831
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
index 01902f525831..29adaede471b 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy_table-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c0fbac2699626562e95fa7448ccc314
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.10 b/metadata/md5-cache/dev-ruby/tilt-2.0.10
index dd189ebb8898..c2d8b85e9461 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.10
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.10.tar.gz -> tilt-2.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3c9cf5f0816c947866ea515d0ee7ab45
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.10-r1 b/metadata/md5-cache/dev-ruby/tilt-2.0.10-r1
index c6193d438a89..7704c4672f89 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.10-r1
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.10.tar.gz -> tilt-2.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bd421788c9c9f805969f472e3aaca8dd
diff --git a/metadata/md5-cache/dev-ruby/time-0.2.0 b/metadata/md5-cache/dev-ruby/time-0.2.0
index 87e9b56be3ae..07a77f10bfaa 100644
--- a/metadata/md5-cache/dev-ruby/time-0.2.0
+++ b/metadata/md5-cache/dev-ruby/time-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/time/archive/v0.2.0.tar.gz -> time-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d1072ec543bb9444a6b33cd918b17e1
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.4 b/metadata/md5-cache/dev-ruby/timecop-0.9.4
index c311b96d8fd2..8317887f8155 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.4
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5f967273baea411cfa319650336fcb55
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.5 b/metadata/md5-cache/dev-ruby/timecop-0.9.5
index 33ebccde242a..ecc1cd4fde6b 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.5
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a355f4f1e1156550910978e45bbe8e2b
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.2.0 b/metadata/md5-cache/dev-ruby/timeout-0.2.0
index 30f407f3d9c8..f365ca18f6fa 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.2.0
+++ b/metadata/md5-cache/dev-ruby/timeout-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.2.0.tar.gz -> timeout-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9cbb51954608fdca4d174b23e9582cb5
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.3.0 b/metadata/md5-cache/dev-ruby/timeout-0.3.0
index df89fda8c963..3b82dffb4696 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.3.0
+++ b/metadata/md5-cache/dev-ruby/timeout-0.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.3.0.tar.gz -> timeout-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9cbb51954608fdca4d174b23e9582cb5
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index b05e39fb0c0d..45223acc85b1 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b07f4539f760bdb7a949efced2c88f3
diff --git a/metadata/md5-cache/dev-ruby/tins-1.29.1 b/metadata/md5-cache/dev-ruby/tins-1.29.1
index 6dbec5af632f..88368fc6fbdb 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.29.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.29.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=42bee8576a84d661391f61b01732c892
diff --git a/metadata/md5-cache/dev-ruby/tins-1.31.0 b/metadata/md5-cache/dev-ruby/tins-1.31.0
index c0a4cc8bb8d3..3e5ba0d2a302 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.31.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.31.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.31.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=032479715ff4b0f66569a53e044eeb3a
diff --git a/metadata/md5-cache/dev-ruby/tins-1.31.1 b/metadata/md5-cache/dev-ruby/tins-1.31.1
index ebb855178c10..c0424e915b02 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.31.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.31.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.31.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fed3277e752bb40acb048b8fdf01cc90
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
index bd8a48de9bf8..2a0e4c8b602a 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tokyocabinet-1.32.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=87ca921baa7b2ad955b971fb21a5fb9c
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8 b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
index 436b2ef8d898..8a90f13dbc17 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v1.2.8.tar.gz -> tomlrb-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=60f572f8b2f211030aa99213dcb6d79d
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
index de7f6da79819..ab225ecdaf23 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.1.tar.gz -> tomlrb-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9f2a2244ff97bb5c21bd1edbf33efcd4
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
index 93f4c915d32c..3ab0495da279 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.2.tar.gz -> tomlrb-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
index f0b31daed5a6..f2fffd035192 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.3.tar.gz -> tomlrb-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
index 05de03b927af..09c114e2a6b9 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/totoridipjp-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d77c92d54095a9c929f4781527181dd7
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
index 404db5a7713e..961cc4d92a91 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/transaction-simple-1.4.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aa7e1014d0c955e527244d7196b19fc6
diff --git a/metadata/md5-cache/dev-ruby/travis-1.10.0-r1 b/metadata/md5-cache/dev-ruby/travis-1.10.0-r1
index c0bb03955db9..f5f12d26dcd7 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/travis-1.10.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/travis-1.10.0.gem
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e437e0a8e84d164dc011f7fc2f62643
diff --git a/metadata/md5-cache/dev-ruby/travis-1.11.0 b/metadata/md5-cache/dev-ruby/travis-1.11.0
index 3aef10820224..847aaf4822c6 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.11.0
+++ b/metadata/md5-cache/dev-ruby/travis-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/travis-1.11.0.gem
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ca00871e6ecd857da19f5a5dea746fe
diff --git a/metadata/md5-cache/dev-ruby/travis-1.11.1 b/metadata/md5-cache/dev-ruby/travis-1.11.1
index 57a63ac65939..a27e1aaddd14 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.11.1
+++ b/metadata/md5-cache/dev-ruby/travis-1.11.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/travis-1.11.1.gem
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ca00871e6ecd857da19f5a5dea746fe
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1 b/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
index 90f0752a7261..092381b2f587 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cjheath/treetop/archive/v1.6.11.tar.gz -> treetop-1.6.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f3ee8df0d6d09df5cc70c47a159c7d8d
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.9.10 b/metadata/md5-cache/dev-ruby/trollop-2.9.10
index 7722314a0b40..0c4adfcdf0da 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.9.10
+++ b/metadata/md5-cache/dev-ruby/trollop-2.9.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/trollop-2.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aa758c581fc93d6f8b51e97346506657
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
index c4bc6fd98853..e9c0fa7e39e5 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.6.2.1.tar.gz -> ttfunk-1.6.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=268900a5b311b574c4a84882decf9365
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
index c451458667ee..2c32c3c57f60 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.7
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.7.0.tar.gz -> ttfunk-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=280ce6a55ab08d2829d567ae1132168c
diff --git a/metadata/md5-cache/dev-ruby/tty-color-0.6.0 b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
index b6eb1ee2b382..2d69d12fbd42 100644
--- a/metadata/md5-cache/dev-ruby/tty-color-0.6.0
+++ b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e477882501b76ba658ef29b86fd49d22
diff --git a/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1 b/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
index 52d7ac37cdfb..a44cc1bbe152 100644
--- a/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-command/archive/v0.10.1.tar.gz -> tty-command-0.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=755475d2b8544a09f827dac40e9b8a68
diff --git a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1 b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
index a0db983b74e4..95853caf9e56 100644
--- a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a2dd9a86db04f8d85673e2b3d2f11f7
diff --git a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0 b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
index cbd9069eef48..7cb5d2cf03ac 100644
--- a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
+++ b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-editor/archive/v0.7.0.tar.gz -> tty-editor-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=28496ada86598a446251eddadd30e849
diff --git a/metadata/md5-cache/dev-ruby/tty-file-0.10.0 b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
index d937c7772041..3925b3edb82a 100644
--- a/metadata/md5-cache/dev-ruby/tty-file-0.10.0
+++ b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-file/archive/v0.10.0.tar.gz -> tty-file-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=97003aafbc913319d8c4c79ec3ce08d6
diff --git a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1 b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
index cc74b9eef161..58bd0a8cc8c0 100644
--- a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-platform/archive/v0.3.0.tar.gz -> tty-platform-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=de92ec18f4a663c7c4ede2c3ed5ccb12
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index bf76def70608..857af97c1cfc 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=65a7d2dfe8201c1563f9f66c89619f57
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
index 90338d4ca7f5..9b28cea352a6 100644
--- a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ffae03a3262dd7fea1f7cc51aeea9fb
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 671ca3b58fb1..58aeb0ed8d61 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6021da17b4d87ecaa3e8c01d142ab331
diff --git a/metadata/md5-cache/dev-ruby/tty-which-0.5.0 b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
index 64864c78d83c..84d505aba102 100644
--- a/metadata/md5-cache/dev-ruby/tty-which-0.5.0
+++ b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-which/archive/v0.5.0.tar.gz -> tty-which-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f263e8b0f01d9bc59e2b46ef31e0f07
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1 b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
index 25e33ca69de6..633d5dafb641 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/turbolinks-5.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d4d796c4be21bdd6e0e0b866c7212e67
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1 b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
index da8a48e291b7..8ec69aa8ea0f 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/turbolinks-source-5.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9aab6841a5dcb5b79ae1bad4025d7720
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
index e3d13778e5e6..d781e71326ff 100644
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b47587694be8ff98cb71e24831cf222
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1 b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
index d9912871cfec..8f6cbe9deeb0 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.1
 SRC_URI=https://rubygems.org/gems/twitter-text-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b5b719ac9c49b91f00ccf52697d77b08
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
index f0855488df17..88cd8257b7b8 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typed-array-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56fef631f87b7943bb5c5972d4950e40
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.15.2 b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
index 4c371fb2e0ab..05b3ad4aefeb 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.15.2
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.15.2.tar.gz -> typeprof-0.15.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=193b5428fdfe36ed7931a62bd72001b5
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.2 b/metadata/md5-cache/dev-ruby/typeprof-0.21.2
index 9debf01df170..3227df3436ea 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.2
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.2.tar.gz -> typeprof-0.21.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c0d7460c0fd043543cf3b05c20526844
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.3 b/metadata/md5-cache/dev-ruby/typeprof-0.21.3
index e1338802468f..cf12c13da1a2 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.3
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.3.tar.gz -> typeprof-0.21.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c0d7460c0fd043543cf3b05c20526844
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
index a9fed96073f6..1f98059bbb70 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f656db08dae2b723db2552ef645b9895
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
index bff0671859cb..b88d91dbf1be 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0a7046099d2eab0643e904d72fa4c5ef
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
index 9bddb3fbf043..ead7429edf6b 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.4.tar.gz -> tzinfo-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e6cef082e47dd8498e4a127f3db66aae
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
index 541385589907..bd0f22877905 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=59a8516e197b3457c1be242dd7468c80
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
index 3dca0741fa5b..4d155f0734db 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b041b87cbfd6d440bf68a3f4eb71fff4
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
index cf811bdf1f70..09aee1f851ff 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ultraviolet-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c164f78dc8fd28d1025f07d47ede8939
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4-r1 b/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
index 3a94bdf991f8..a430f9d88c6b 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f9ca18f3dd91f281f75d569daba92562
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
index c6127a222ab5..5c269828a877 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1fd8143c194299377bc513a925f974e6
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
index 4a88c480a4ac..8c6642903dbd 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=246f2a2a6c802f5f3321af75e5ef110e
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
index fe53bf876a36..6a0872fe24ba 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5cb48255f6f1641dbe8660485d241ce6
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
index 0cd6d65d91c8..aa513d3c874b 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=af0f6bc41d438cb979db3bcfb34f0283
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
index e231e828b5b1..c69f5c83f401 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v1.7.0.tar.gz -> unicode-display_width-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bd0f8835d1237a31a494a86f575fad14
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
index f75b31400fb7..0c5db3508a06 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.1.0.tar.gz -> unicode-display_width-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=639151bf30300a42f77ea02fb5ddadfd
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
index 82b3e037e705..4f9ba847bb21 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.2.0.tar.gz -> unicode-display_width-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=639151bf30300a42f77ea02fb5ddadfd
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
index 06e9171f285b..a7284a4e7cf0 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0-r1
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a45b8704b2505e0c9e27a4f7ecc4e12c
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0 b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
index c0e4f0f9ecf2..ec2f1311e99c 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=195b422f090988a98347254498f324a5
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
index 5c30ed7443ee..42d66e3767ba 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.2.tar.gz -> vagrant_cloud-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1bf0098fd198cace20c0f1ff1c719435
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
index a5741a8fec09..704c092a3a47 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.5.tar.gz -> vagrant_cloud-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=45130ac9e43a3e2536954494212691cb
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0 b/metadata/md5-cache/dev-ruby/vcard-0.3.0
index 97e7ff08042a..9f9a684cc6fa 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0
+++ b/metadata/md5-cache/dev-ruby/vcard-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a034657c02551445be09e4599cf7881b
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1 b/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
index af6751723e19..0cd72547c23c 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f8d683e56e49e36dc57da1a10df1f88d
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index 961c5ed1abdf..973a8630bbad 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=88030277d71136d556fda8610ebf4504
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.1.0 b/metadata/md5-cache/dev-ruby/vcr-5.1.0
index 49a9e8c162bd..395d5796ac96 100644
--- a/metadata/md5-cache/dev-ruby/vcr-5.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/vcr/vcr/archive/v5.1.0.tar.gz -> vcr-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5088062c0b741964002c1c5492edede1
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.0.0 b/metadata/md5-cache/dev-ruby/vcr-6.0.0
index 188adf2a2c09..043815082cfd 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.0.0.tar.gz -> vcr-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9572943ed7ba3f6efe85bdc919d20dd1
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.1.0 b/metadata/md5-cache/dev-ruby/vcr-6.1.0
index 346f8ae7fe34..fe0ca0173392 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.1.0.tar.gz -> vcr-6.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f10fa75908dccc45a099ffaac87f0188
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index 240e8db6f644..efbf075b8a61 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/virtus-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=024b8e9733798ba6e425c0e828f89739
diff --git a/metadata/md5-cache/dev-ruby/virtus-2.0.0 b/metadata/md5-cache/dev-ruby/virtus-2.0.0
index 2fc5dd64413a..cd86bd9d047d 100644
--- a/metadata/md5-cache/dev-ruby/virtus-2.0.0
+++ b/metadata/md5-cache/dev-ruby/virtus-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/virtus-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3cb7f1e8387f001e6e3c789ecdb8b26
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.1 b/metadata/md5-cache/dev-ruby/vlad-2.7.1
index 7fb30b88e793..f01650816167 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.1
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vlad-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=190200078f4be99d7a483e5be0637830
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.9-r1 b/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
index e8bef9734e11..8255f4075de9 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wardencommunity/warden/archive/v1.2.9.tar.gz -> warden-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b814adce72266fbd8f81d2cd7a770827
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.7.0 b/metadata/md5-cache/dev-ruby/web-console-3.7.0
index dcb52c676339..4658e6a3efe2 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.7.0
+++ b/metadata/md5-cache/dev-ruby/web-console-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.7.0.tar.gz -> web-console-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ed558ba797cbccafc3e792eb3ac6feae
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.2.0 b/metadata/md5-cache/dev-ruby/web-console-4.2.0
index b829c55e93d5..7e2f9ee694b6 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.2.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.2.0.tar.gz -> web-console-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=498142a8a0c9c38e2a172b5c6ca1c093
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.14.0 b/metadata/md5-cache/dev-ruby/webmock-3.14.0
index 66fca75dc64b..6e003c4d0ca2 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.14.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f883469a0e19dfa4fe07a4a2cdea870f
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0 b/metadata/md5-cache/dev-ruby/webrick-1.7.0
index 86f88f936cfe..4e1c4a0128a4 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=68796ef1304857b9e62648cadaa7a965
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1 b/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
index 1dbb202bca4b..569056cc85b4 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c397fabfe773a51141ddb0066614bbcd
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
index cb498a25c2fd..68a68cebaf43 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webrobots-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3de7a6b368714d1b0e81c39b433e118e
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1 b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
index 549f69e257ce..caf239a5df01 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f44d965cf5927ee374ca464673bbf0b3
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
index e02a36133931..b05334987458 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8c91f1c3a4a6480a69c09ac38ab2988b
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
index 94fd61db966c..6bd8b6b6b61b 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.5.tar.gz -> websocket-driver-0.7.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1e82fae957ac7f88a7ed56f79a0b1800
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
index 5ffc41010bdb..c45c91810b9e 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=32432eb9cc367f210eecc08dc9f3f426
diff --git a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1 b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
index 011707623ceb..e575da7e1dff 100644
--- a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/whole_history_rating-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=05e35806ffae53e006783e11576c5f3d
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1 b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
index aec5a863b597..0210d08930e2 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/will_paginate-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=be356e38c4e15cab3a8c3fcb12679190
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.3 b/metadata/md5-cache/dev-ruby/windows_error-0.1.3
index e82aa259f13b..4a12326eb488 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.3
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=93d69409880ed85ac4e88a3dad8eacde
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.4 b/metadata/md5-cache/dev-ruby/windows_error-0.1.4
index 884405142a01..c25395569785 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.4
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dd693a33c99ed3f2858a36f7de6cac81
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
index d76836e8e459..a37ce3f230fc 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wirble-0.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7270a9d832a4baae6e8d9190846b3364
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index d384e6bd1a34..b75762316844 100644
--- a/metadata/md5-cache/dev-ruby/wisper-2.0.1
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0b983566be43a96646bdc851a678bb14
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.9 b/metadata/md5-cache/dev-ruby/x25519-1.0.9
index 3fbb30f76378..e6deee348408 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.9
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.9.tar.gz -> x25519-1.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=df76c69f0e2e1b4eafe99749e118664a
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.1 b/metadata/md5-cache/dev-ruby/xdr-3.0.1
index 46f3cc4a1b2c..27580d6e7765 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.1
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.0.1
 SRC_URI=https://rubygems.org/gems/xdr-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4e2501bdbd886988207bbc9a9e57d5f2
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.3 b/metadata/md5-cache/dev-ruby/xdr-3.0.3
index 5217b2d3da3a..78026b61b84d 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.3
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/astroband/ruby-xdr/archive/v3.0.3.tar.gz -> xdr-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9777be2b42ef88a333023d23735ea89c
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.9 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
index 9d2b2f09841a..bf2b31061a33 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/7b8bdf7b33ab872bb4d1fb8eeecba5c5e1a4a421.tar.gz -> xml-simple-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0a140309e98e902f6432c18b8305215b
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
index 029a1fea3b6b..2a08300c86ad 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.2.tar.gz -> xmlrpc-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f2cb274fd77ec973e982fd6611e52366
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0 b/metadata/md5-cache/dev-ruby/xpath-3.2.0
index a35487235358..b47943375bf4 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=46b6f5e8b5e2fd4e41948eba1e4e09a0
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1 b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
index 64001901cfdc..9e6cba962b12 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d63225bcfd3c878e5f921ff94ed82ef9
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
index 42ab48677bb9..d8a35cf75348 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=752b4aa8d0f1200c006aeb18a3776438
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
index bd1c3c00d67b..379429c4ac95 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=507ee67647eeef082e747c35851403d5
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index bd48ce98d297..0add6a7a9e4d 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.26.tar.gz -> yard-0.9.26-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=16f7b76acd160ae011f97273b2e8af15
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.27 b/metadata/md5-cache/dev-ruby/yard-0.9.27
index 6da9ecb61292..e1e71dff1873 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.27
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.27
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.27.tar.gz -> yard-0.9.27-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=08b3625ccef67ad5796ea1618fc70096
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.28 b/metadata/md5-cache/dev-ruby/yard-0.9.28
index 657e71f8233c..0c212cbb45f5 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.28
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.28
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.28.tar.gz -> yard-0.9.28-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=484aaf43a34f038ee21f144316f73b50
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
index 0ba041b210f2..2df9bbff031e 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.2.tar.gz -> zeitwerk-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f3489ff427fdf5bfd7530ef12e032364
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4 b/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
index c7dcc88e6f29..0b174ccb0d5d 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.5.4.tar.gz -> zeitwerk-2.5.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=76f7a0f2ae977a548fe315840d29057a
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
index 4ba3b24bc18e..e43bfa23eeae 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.0.tar.gz -> zeitwerk-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=76f7a0f2ae977a548fe315840d29057a
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.1 b/metadata/md5-cache/dev-ruby/zentest-4.12.1
index cc1aeca50978..bc51e4650dae 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ZenTest-4.12.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cde305c27de0095be3ceeeacfc8d4bee
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 2c5efcde806b..db70099c468c 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.15 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.15
new file mode 100644
index 000000000000..2c7946e61673
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.15
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=install test
+DEPEND=dev-lang/tk:0
+DESCRIPTION=High-level widget set for Tcl/Tk
+EAPI=7
+HOMEPAGE=http://tcllib.sourceforge.net/
+INHERIT=virtualx
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=tcltk
+RDEPEND=dev-lang/tk:0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/tcllib/BWidget/1.9.15/BWidget-1.9.15.zip
+_eclasses_=virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=297e2080003a8d6004209c8d8f8277cf
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e91332e131ee..ea55beabdad6 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/Tensile-5.0.2 b/metadata/md5-cache/dev-util/Tensile-5.0.2-r1
similarity index 98%
rename from metadata/md5-cache/dev-util/Tensile-5.0.2
rename to metadata/md5-cache/dev-util/Tensile-5.0.2-r1
index d17168c2bf8d..bd149c237ae2 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.0.2
+++ b/metadata/md5-cache/dev-util/Tensile-5.0.2-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.0.2.tar.gz -> rocm-Tensile-5.0.2.tar.gz https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/Tensile-5.0.2-PR1419.patch.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b11989c2e127d36cd158e9eb078e6d6d
+_md5_=645515221567f78fc75ad6aefb32f1a6
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index e39117933da9..eefca8dbfd1f 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=19cad316a0b504cba01ad67a0a3e032e
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3-r1 b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
index 938409336eb1..f8cc5f9c9b21 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a31e86174aad224dfa3370e3c119ef6
diff --git a/metadata/md5-cache/dev-util/aruba-1.1.2-r1 b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
index db26944d6fca..06e52d89bf20 100644
--- a/metadata/md5-cache/dev-util/aruba-1.1.2-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.1.2.tar.gz -> aruba-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2ddfe83f7cefacd4ac52d0a902c6d1b5
diff --git a/metadata/md5-cache/dev-util/aruba-2.0.0 b/metadata/md5-cache/dev-util/aruba-2.0.0
index 753b29a4054f..4154195dc817 100644
--- a/metadata/md5-cache/dev-util/aruba-2.0.0
+++ b/metadata/md5-cache/dev-util/aruba-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/aruba/archive/v2.0.0.tar.gz -> aruba-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=132bf0a23dddc1ba7e4fcc50ebcd1f0f
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1 b/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
index 75f7184c2abe..a24b9869ff4a 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
 INHERIT=readme.gentoo-r1 distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/buildbot-worker/buildbot-worker-3.5.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3062841e0c855df1ecd4c2ae4d2d4c80
+_md5_=d7ef068adedb7cf4afdc02ecb607f221
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.8.1 b/metadata/md5-cache/dev-util/cppcheck-2.8.1
new file mode 100644
index 000000000000..cb288695bdc6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cppcheck-2.8.1
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) test? ( htmlreport? ( 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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 )
+DESCRIPTION=Static analyzer of C/C++ code
+EAPI=8
+HOMEPAGE=https://github.com/danmar/cppcheck
+INHERIT=distutils-r1 cmake
+IUSE=htmlreport pcre qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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/danmar/cppcheck/archive/refs/tags/2.8.1.tar.gz -> cppcheck-2.8.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a280b2e4c1b6ab05f45c9ae9c59dd317
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
index 0f143066e611..b97666c20729 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c6151cf56697e8e8ef6b6c924b9053c6
diff --git a/metadata/md5-cache/dev-util/cucumber-7.1.0 b/metadata/md5-cache/dev-util/cucumber-7.1.0
index b258c2174153..2b7f3de4edbd 100644
--- a/metadata/md5-cache/dev-util/cucumber-7.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-7.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.1.0.tar.gz -> cucumber-7.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=eb5290a225bc6beaf9c38cd8e74b966b
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.1.1 b/metadata/md5-cache/dev-util/cucumber-core-10.1.1
index 74ec1e5219a5..0d41133ac14f 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.1.1.tar.gz -> cucumber-core-10.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=77d5915fac029b7a25c94b7bb2a9d526
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index 7e29fc1dd8bb..659603382d86 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6058a470933d5bdcda113433b67d4c8b
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
index 043525771e37..5da35da81b6f 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3f1b9ffd931b3cc443898f0afd85d5a1
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
index c7648eb02eb2..8a7d9bfec6eb 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=892000a753933205a96d9d6e3213aeaa
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
index 37a963b109cf..b800a13040ac 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-14.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9fff3ceed4a012b76f389a76e86254e3
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
index 59951f17dae4..3c655f6b118d 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-15.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=918e1f5134d3ad333ab1529f35b2407e
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index 359f170f9cfa..429469d7c877 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1cb03291d66da40912ae9837e73decb2
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0 b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
index 720de03f5fff..a9f976d05cdb 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=22
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v22.0.0.tar.gz -> cucumber-gherkin-22.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9560d384258346407155d2fda15716d
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
index 132c04a9876d..f41311c693d2 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=23
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v23.0.1.tar.gz -> cucumber-gherkin-23.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3e2a8081fbe909e52c61606bd552b777
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0 b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
index 8e3e9b16c7c8..4bb9958e82ce 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-17.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=943d5ee2d4d8e309d1f8a77cb6b0cc8c
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
index a014a8b05a0f..89fe52538dd6 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d766ae5ce9f1a92cd1bb7cec9aaecdd6
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-18.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
index eeb8fcf20052..1c048950dcc4 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=18
 SRC_URI=https://rubygems.org/gems/cucumber-messages-18.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=74cdc91cc4cc0de0bca9cc2a2c4e41a2
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
index 9abba57c439b..d7e4c27946be 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-rails-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d1a1e6e25961dedc9a6fced8c8694e4f
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1 b/metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1
index 3bfe80e64135..72ba6c06aaa4 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.5.0.tar.gz -> cucumber-rails-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=88342c2ddfde521fd24cfbaedf9d8ff5
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.5.1 b/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
index 5098ab6e7fec..5de63714cee2 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.5.1.tar.gz -> cucumber-rails-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b031c283f7fd6efb565956f305bac80d
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
index 110c26d9e0ee..915cdc51b854 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e7276891297d79b1f999459eb7111e6f
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index 8a1811b0f499..f35be6eb01a6 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=46af1ae9d04a30d6499950d2367a7452
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index 29fea46876d1..1fa0feb8b09f 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cc606ea19aa95de1d8db17b03334664b
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.2.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
index cbccb83b4838..e71138e3c2d7 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-wire-6.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b88de256fcd16d1dcc232e53d117c2d5
diff --git a/metadata/md5-cache/dev-util/hip-5.0.2-r2 b/metadata/md5-cache/dev-util/hip-5.0.2-r2
index 4ec5f2f3ef62..efc0620f6774 100644
--- a/metadata/md5-cache/dev-util/hip-5.0.2-r2
+++ b/metadata/md5-cache/dev-util/hip-5.0.2-r2
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=profile? ( || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/CppHeaderParser[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-util/rocminfo:0/5.0 =sys-devel/llvm-roc-5.0.2*[runtime] dev-libs/rocm-comgr:0/5.0 virtual/opengl
 DESCRIPTION=C++ Heterogeneous-Compute Interface for Portability
 EAPI=8
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/hipamd
-INHERIT=cmake prefix
+INHERIT=cmake prefix python-any-r1
 IUSE=debug profile
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-util/rocminfo:0/5.0 =sys-devel/llvm-roc-5.0.2*[runtime] dev-libs/rocm-comgr:0/5.0 virtual/opengl dev-perl/URI-Encode dev-libs/roct-thunk-interface:0/5.0
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.0.2.tar.gz -> rocm-hipamd-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.0.2.tar.gz -> rocm-hip-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.0.2.tar.gz -> rocclr-5.0.2.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.0.2.tar.gz -> rocm-opencl-runtime-5.0.2.tar.gz profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.0.2.tar.gz -> rocm-tracer-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/hipamd/files/8311148/hip_prof_str_diff.gz -> 5.0.2-update-header.patch.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d296802e22a59cb7cc71324aa45ad48c
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=474221b3a16cf2c7bf9ef65952d67eb6
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.17 b/metadata/md5-cache/dev-util/maturin-0.12.17
deleted file mode 100644
index bdca89bcf4c2..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.12.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boltons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://maturin.rs/
-INHERIT=cargo distutils-r1 flag-o-matic
-IUSE=doc test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.12.17.tar.gz -> maturin-0.12.17.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.0/download -> cab-0.4.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.0.8/download -> camino-1.0.8.crate https://crates.io/api/v1/crates/cargo-options/0.1.4/download -> cargo-options-0.1.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.8.5/download -> cargo-xwin-0.8.5.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.8.7/download -> cargo-zigbuild-0.8.7.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.2/download -> cargo_metadata-0.14.2.crate https://crates.io/api/v1/crates/cbindgen/0.23.0/download -> cbindgen-0.23.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.0/download -> cfb-0.7.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_complete/3.1.4/download -> clap_complete-3.1.4.crate https://crates.io/api/v1/crates/clap_complete_fig/3.1.5/download -> clap_complete_fig-3.1.5.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.1/download -> dialoguer-0.10.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/goblin/0.5.1/download -> goblin-0.5.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/indicatif/0.17.0-rc.6/download -> indicatif-0.17.0-rc.6.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/keyring/1.1.2/download -> keyring-1.1.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.2.9/download -> lddtree-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.15.0/download -> minijinja-0.15.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.18.0+1.1.1n/download -> openssl-src-111.18.0+1.1.1n.crate https://crates.io/api/v1/crates/openssl-sys/0.9.73/download -> openssl-sys-0.9.73.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.1/download -> os_str_bytes-6.0.1.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.4.0/download -> ureq-2.4.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.0.0/download -> uuid-1.0.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.3/download -> webpki-roots-0.22.3.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.3/download -> xwin-0.2.3.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.2/download -> python3-dll-a-0.2.2.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=9344f7f4f86214990b87c403e59648f9
diff --git a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1 b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
index e38e5c4fd000..e6ffc00da75b 100644
--- a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
+++ b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/protobuf-cucumber-3.10.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c502bd175eac0904a7faa12fa16e1571
diff --git a/metadata/md5-cache/dev-util/rebar-3.18.0 b/metadata/md5-cache/dev-util/rebar-3.18.0-r1
similarity index 89%
rename from metadata/md5-cache/dev-util/rebar-3.18.0
rename to metadata/md5-cache/dev-util/rebar-3.18.0-r1
index ff4d236cd211..73204cbc8065 100644
--- a/metadata/md5-cache/dev-util/rebar-3.18.0
+++ b/metadata/md5-cache/dev-util/rebar-3.18.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/erlang !dev-util/rebar-bin
+DEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=8
 HOMEPAGE=https://www.rebar3.org https://github.com/erlang/rebar3
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1
 IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0 MIT BSD
-RDEPEND=dev-lang/erlang !dev-util/rebar-bin
+RDEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/erlang/rebar3/archive/refs/tags/3.18.0.tar.gz -> rebar-3.18.0.tar.gz https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar https://repo.hex.pm/tarballs/certifi-2.8.0.tar https://repo.hex.pm/tarballs/cf-0.3.1.tar https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar https://repo.hex.pm/tarballs/getopt-1.0.1.tar https://repo.hex.pm/tarballs/providers-1.9.0.tar https://repo.hex.pm/tarballs/relx-4.6.0.tar https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=36ba1abe10a4f551e6cd62b5fffe5f56
+_md5_=604ef7b644dba55e82b5bc942b00a242
diff --git a/metadata/md5-cache/dev-util/rebar-3.19.0 b/metadata/md5-cache/dev-util/rebar-3.19.0
new file mode 100644
index 000000000000..9c565cec1df9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rebar-3.19.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=8
+HOMEPAGE=https://www.rebar3.org https://github.com/erlang/rebar3
+INHERIT=bash-completion-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0 MIT BSD
+RDEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://github.com/erlang/rebar3/archive/refs/tags/3.19.0.tar.gz -> rebar-3.19.0.tar.gz https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar https://repo.hex.pm/tarballs/certifi-2.9.0.tar https://repo.hex.pm/tarballs/cf-0.3.1.tar https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar https://repo.hex.pm/tarballs/getopt-1.0.1.tar https://repo.hex.pm/tarballs/providers-1.9.0.tar https://repo.hex.pm/tarballs/relx-4.7.0.tar https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0e38d052147173dd987fd769f6aeb3d5
diff --git a/metadata/md5-cache/dev-util/rizin-0.4.0-r1 b/metadata/md5-cache/dev-util/rizin-0.4.0-r1
new file mode 100644
index 000000000000..923a12591417
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rizin-0.4.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-apps/file app-arch/lz4:0= dev-libs/capstone:0= dev-libs/libuv:0= dev-libs/libzip:0= dev-libs/openssl:0= >=dev-libs/tree-sitter-0.19.0 dev-libs/xxhash sys-libs/zlib:0=
+DESCRIPTION=reverse engineering framework for binary analysis
+EAPI=8
+HOMEPAGE=https://rizin.re/
+INHERIT=meson python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 BSD LGPL-3 MIT
+RDEPEND=sys-apps/file app-arch/lz4:0= dev-libs/capstone:0= dev-libs/libuv:0= dev-libs/libzip:0= dev-libs/openssl:0= >=dev-libs/tree-sitter-0.19.0 dev-libs/xxhash sys-libs/zlib:0=
+RESTRICT=fetch !test? ( test )
+SLOT=0/0.4.0
+SRC_URI=mirror+https://github.com/rizinorg/rizin/releases/download/v0.4.0/rizin-src-v0.4.0.tar.xz test? ( https://github.com/rizinorg/rizin-testbins/archive/64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz -> rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz )
+_eclasses_=meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f54173c8cc0b9e8db506770c4f57d0f3
diff --git a/metadata/md5-cache/dev-util/unicorn-2.0.0 b/metadata/md5-cache/dev-util/unicorn-2.0.0
new file mode 100644
index 000000000000..eba1a7143b55
--- /dev/null
+++ b/metadata/md5-cache/dev-util/unicorn-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python? ( >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) dev-libs/glib:2
+DESCRIPTION=A lightweight multi-platform, multi-architecture CPU emulator framework
+EAPI=8
+HOMEPAGE=https://www.unicorn-engine.org
+INHERIT=cmake distutils-r1
+IUSE=python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1
+RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0/2
+SRC_URI=https://github.com/unicorn-engine/unicorn/archive/2.0.0.tar.gz -> unicorn-2.0.0.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=10a0d18bf979e2b706d6182a77248659
diff --git a/metadata/md5-cache/dev-util/unicorn-9999 b/metadata/md5-cache/dev-util/unicorn-9999
index 424c6e29d52f..4fae49f62c79 100644
--- a/metadata/md5-cache/dev-util/unicorn-9999
+++ b/metadata/md5-cache/dev-util/unicorn-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig python? ( >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/glib:2
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) dev-libs/glib:2
 DESCRIPTION=A lightweight multi-platform, multi-architecture CPU emulator framework
 EAPI=8
 HOMEPAGE=https://www.unicorn-engine.org
 INHERIT=cmake distutils-r1 git-r3
-IUSE=python static-libs python_targets_python3_9 python_targets_python3_10
+IUSE=python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2 GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0/2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a6e3e10a278eb2e2ba1d379b13b2588a
+_md5_=10a0d18bf979e2b706d6182a77248659
diff --git a/metadata/md5-cache/dev-util/watchman-2022.07.04.00 b/metadata/md5-cache/dev-util/watchman-2022.07.04.00
new file mode 100644
index 000000000000..966b6cbe020d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/watchman-2022.07.04.00
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/libevent:= dev-libs/libpcre ~dev-cpp/folly-2022.07.04.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-libs/libevent:= dev-libs/libpcre ~dev-cpp/folly-2022.07.04.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) dev-cpp/gtest
+DESCRIPTION=A file watching service
+EAPI=8
+HOMEPAGE=https://facebook.github.io/watchman/
+INHERIT=cargo cmake distutils-r1 tmpfiles
+IUSE=llvm-libunwind python test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libevent:= dev-libs/libpcre ~dev-cpp/folly-2022.07.04.00:= dev-cpp/glog:= >=dev-libs/libfmt-8.1.1-r1:= dev-libs/openssl:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) virtual/tmpfiles
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facebook/watchman/archive/refs/tags/v2022.07.04.00.tar.gz -> watchman-2022.07.04.00.tar.gz https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.55/download -> anyhow-1.0.55.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/const-random/0.1.13/download -> const-random-0.1.13.crate https://crates.io/api/v1/crates/const-random-macro/0.1.13/download -> const-random-macro-0.1.13.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.7/download -> crossbeam-epoch-0.9.7.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.4/download -> crossbeam-queue-0.3.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.7/download -> crossbeam-utils-0.8.7.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/futures/0.1.31/download -> futures-0.1.31.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/getrandom/0.2.5/download -> getrandom-0.2.5.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/jwalk/0.6.0/download -> jwalk-0.6.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mio/0.8.0/download -> mio-0.8.0.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.1/download -> parking_lot_core-0.9.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quote/1.0.15/download -> quote-1.0.15.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.26/download -> structopt-0.3.26.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/syn/1.0.86/download -> syn-1.0.86.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tokio/1.17.0/download -> tokio-1.17.0.crate https://crates.io/api/v1/crates/tokio-macros/1.7.0/download -> tokio-macros-1.7.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.9/download -> tokio-util-0.6.9.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.32.0/download -> windows_aarch64_msvc-0.32.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.32.0/download -> windows_i686_gnu-0.32.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.32.0/download -> windows_i686_msvc-0.32.0.crate https://crates.io/api/v1/crates/windows-sys/0.32.0/download -> windows-sys-0.32.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.32.0/download -> windows_x86_64_gnu-0.32.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.32.0/download -> windows_x86_64_msvc-0.32.0.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7593f7220e34fc953640a1702eb8b955
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index c639fb9efb8e..b06ab3a0b1e9 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/camato-0.7.4-r2 b/metadata/md5-cache/games-board/camato-0.7.4-r2
index 16bcf2a78426..a05a1c8db477 100644
--- a/metadata/md5-cache/games-board/camato-0.7.4-r2
+++ b/metadata/md5-cache/games-board/camato-0.7.4-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/camato-0_7_4.tar.gz https://dev.gentoo.org/~ionen/distfiles/camato.png
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ad7da6182719145a00f4ecd323294151
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 48676d06ff2a..d0d70784d3c4 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
index 23932ec8ffcc..2e71c91acc3e 100644
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3b9a92bafec8c1612689e627ba16e64
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index ef8b199f750d..28f55a746c8a 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.18.2 b/metadata/md5-cache/games-server/minecraft-server-1.18.2
deleted file mode 100644
index 3d922a20379c..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.18.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=amd64 ~arm64
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar -> minecraft-server-1.18.2.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1bc34479b2f8a1a3cab7d2c817a033a5
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19 b/metadata/md5-cache/games-server/minecraft-server-1.19
index 39e5ad774562..86669afe8392 100644
--- a/metadata/md5-cache/games-server/minecraft-server-1.19
+++ b/metadata/md5-cache/games-server/minecraft-server-1.19
@@ -5,11 +5,11 @@ DESCRIPTION=The official server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
 INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Mojang
 RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar -> minecraft-server-1.19.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=154f494f94ffb7d364b0d55373bd62cf
+_md5_=6ea6f9b11a94100138fdaa2a428fa7b3
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index f5a1d59c0945..c631941a1433 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.1 b/metadata/md5-cache/games-simulation/openrct2-0.4.1
new file mode 100644
index 000000000000..f9a403c7dd2e
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
+EAPI=8
+HOMEPAGE=https://openrct2.org/
+INHERIT=cmake readme.gentoo-r1 xdg-utils
+IUSE=dedicated +lightfx +opengl scripting test +truetype
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.1.tar.gz -> openrct2-0.4.1.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.3.2/objects.zip -> openrct2-objects-1.3.2.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.67/replays.zip -> openrct2-replays-0.0.67.zip )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=50cf5882f21bf46043a5f4005daf83b6
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 7247ea61c392..87e25e5cf0c2 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.2.7/objects.zip -> openrct2-objects-1.2.7.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.67/replays.zip -> openrct2-replays-0.0.67.zip )
+SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.3.2/objects.zip -> openrct2-objects-1.3.2.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.67/replays.zip -> openrct2-replays-0.0.67.zip )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=022f5604772aded8f364f9c661788eeb
+_md5_=245974e27fa429e95c64f8de6a6bc398
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 0267dbf9f986..37c3f5b44aa1 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.1.3 b/metadata/md5-cache/gui-libs/libadwaita-1.1.3
new file mode 100644
index 000000000000..54234ed9692d
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.1.3
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 ) ) >=dev-util/meson-0.59.0 dev-util/glib-utils sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Building blocks for modern adaptive GNOME applications
+EAPI=8
+HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
+INHERIT=gnome.org meson python-any-r1 vala virtualx
+IUSE=+introspection test +vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libadwaita/1.1/libadwaita-1.1.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=f1e33987a0fe11be0c1f6c61cee8fe4e
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.6.3 b/metadata/md5-cache/gui-libs/libhandy-1.6.3
new file mode 100644
index 000000000000..9ba40ef40175
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libhandy-1.6.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=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:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Building blocks for modern adaptive GNOME apps
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
+INHERIT=gnome.org meson xdg vala virtualx
+IUSE=examples glade gtk-doc +introspection test +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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 )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libhandy/1.6/libhandy-1.6.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3c87d4797108946fd2d46e60c73ad32c
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 0e8057160719..3a0374b588c7 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/sway-1.7-r1 b/metadata/md5-cache/gui-wm/sway-1.7-r1
new file mode 100644
index 000000000000..4cbc04734880
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.24 >=dev-util/meson-0.60.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.15:=[X=] <gui-libs/wlroots-0.16:=[X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+INHERIT=meson
+IUSE=grimshot +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config grimshot? ( app-misc/jq gui-apps/grim gui-apps/slurp gui-apps/wl-clipboard x11-libs/libnotify ) >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.15:=[X=] <gui-libs/wlroots-0.16:=[X=]
+REQUIRED_USE=grimshot? ( swaymsg )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.7.tar.gz -> sway-1.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1d94afefe82c332b5026f7587f45a15d
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index d57b09801b7b..d28b94e64e5a 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -5,10 +5,11 @@ DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 INHERIT=meson git-r3
-IUSE=+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
+IUSE=grimshot +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
+RDEPEND=x11-misc/xkeyboard-config grimshot? ( app-misc/jq gui-apps/grim gui-apps/slurp gui-apps/wl-clipboard x11-libs/libnotify ) >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
+REQUIRED_USE=grimshot? ( swaymsg )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=aa5364b9f16022953294ade50bdbcba0
+_md5_=1fbed2c75a8738d95bb15ca4f7d9fcaf
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index ae79dcc58256..839f6093aac5 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kalarm-22.04.3 b/metadata/md5-cache/kde-apps/kalarm-22.04.3
index 41b58cec745f..4255d19307d6 100644
--- a/metadata/md5-cache/kde-apps/kalarm-22.04.3
+++ b/metadata/md5-cache/kde-apps/kalarm-22.04.3
@@ -12,4 +12,4 @@ RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.04.3/src/kalarm-22.04.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5a16c28b10d85add83ff27cde3fbed1a
+_md5_=9fdb20e58f36246b0e61b07612baad82
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 5616257dbe4f..f8a0b75201dc 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.96.0 b/metadata/md5-cache/kde-frameworks/attica-5.96.0
new file mode 100644
index 000000000000..9c9a5aa846f8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/attica-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ad0bf0c18f3067cc6893c9c89785ddc4
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.96.0 b/metadata/md5-cache/kde-frameworks/baloo-5.96.0
new file mode 100644
index 000000000000..06fd69f85119
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kfilemetadata-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kidletime-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/solid-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kfilemetadata-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kidletime-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/solid-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/baloo-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5aa4515901995e1d159a3381a569bd23
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.96.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.96.0
new file mode 100644
index 000000000000..e946ffea3363
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org udev
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/bluez-qt-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aa0e82b43d3616ae19920894b6b2382c
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
new file mode 100644
index 000000000000..7f51be958133
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.96:5 test? ( app-misc/fdupes ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=cmake kde.org python-any-r1 xdg-utils
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cd3451d0374f660d50e9e1c13d1d13c5
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
new file mode 100644
index 000000000000..3894b30df186
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.96:5 test? ( app-misc/fdupes ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=cmake kde.org python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=44e7a67129cd2c602614318fcdf5849e
diff --git a/metadata/md5-cache/kde-frameworks/countryflags-5.96.0 b/metadata/md5-cache/kde-frameworks/countryflags-5.96.0
new file mode 100644
index 000000000000..78ee84e0fff8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/countryflags-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Icons of flags for various countries
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=!<kde-frameworks/kdelibs4support-5.90.0:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=632655a95831cc9260bacf0475fa2789
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
new file mode 100644
index 000000000000..adb6f843a45d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) >=dev-qt/qthelp-5.15.4:5 ) test? ( >=dev-qt/linguist-tools-5.15.4:5 >=dev-qt/qtcore-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
+INHERIT=cmake kde.org python-any-r1
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=28b09987956a622ac1157a019b91f2d3
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.96.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.96.0
new file mode 100644
index 000000000000..ae8bc28098f1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/knewstuff-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/knewstuff-5.96*:5 =kde-frameworks/knotifications-5.96*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/frameworkintegration-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b1933a5da098018bd6f0d8940581fa7b
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.96.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.96.0
new file mode 100644
index 000000000000..9e7af3075220
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5[widgets] >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5[widgets] >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kactivities-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4205d065a1082e268ba1fade59fc0f68
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.96.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.96.0
new file mode 100644
index 000000000000..188a01675a62
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 =kde-frameworks/kactivities-5.96*:5 =kde-frameworks/kconfig-5.96*:5 test? ( >=dev-libs/boost-1.54 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 =kde-frameworks/kactivities-5.96*:5 =kde-frameworks/kconfig-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kactivities-stats-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d02f623a8cd7edfd7400cc9b18cb34a9
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.96.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.96.0
new file mode 100644
index 000000000000..158d39cc7389
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-42.0.2[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=kde.org distutils-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kapidox-5.96.0.tar.xz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	kde.org	916c61efa7151f09c7701328b88cafc1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c8013d5747fc2b7d2e10f1588eb36711
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.96.0 b/metadata/md5-cache/kde-frameworks/karchive-5.96.0
new file mode 100644
index 000000000000..41d8472112d3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=zstd? ( virtual/pkgconfig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+zstd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/karchive-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c6fbe26d57bd5aecb0477c5702e019f5
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.96.0 b/metadata/md5-cache/kde-frameworks/kauth-5.96.0
new file mode 100644
index 000000000000..1921dceb10bb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.96.0
@@ -0,0 +1,17 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kauth-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e16f36a04f439a8be9e3c7fe5e4b81b
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.96.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.96.0
new file mode 100644
index 000000000000..dc24690c0193
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/kconfigwidgets-5.96:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kbookmarks-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f8387bf7f1875ab16462fb1eb2d266fc
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.96.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.96.0
new file mode 100644
index 000000000000..1e9bb4e5aaef
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcalendarcore-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a8b2d1e7ecfc6901923139f93c89db4b
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.96.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.96.0
new file mode 100644
index 000000000000..cd0cce19520f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5[widgets] >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5[widgets] >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcmutils-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2fc56487c5029ea4d9034f1f50a262e2
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.96.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.96.0
new file mode 100644
index 000000000000..399842c17a84
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcodecs-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=23d2344891c661d555b26a76e9d2692f
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.96.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.96.0
new file mode 100644
index 000000000000..8e18919b5b33
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcompletion-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=98fad5242f00c439f0e6842564b36489
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.96.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.96.0
new file mode 100644
index 000000000000..35c484a4c075
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 dbus? ( >=dev-qt/qtdbus-5.15.4:5 ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( >=dev-qt/qtconcurrent-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=dbus nls qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 dbus? ( >=dev-qt/qtdbus-5.15.4:5 ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kconfig-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=df849f50783224df548be8afa1123af8
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.96.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.96.0
new file mode 100644
index 000000000000..df3ffb563b38
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kconfigwidgets-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2f1eab563de875d33aec3aa0abf61db6
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.96.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.96.0
new file mode 100644
index 000000000000..89dbf6393e16
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 test? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcontacts-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9a2c100b99f9327b42bcffdf9dede54c
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.96.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.96.0
new file mode 100644
index 000000000000..e469402f1f17
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.4:5[icu] dbus? ( >=dev-qt/qtdbus-5.15.4:5 ) fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org xdg-utils
+IUSE=dbus fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.4:5[icu] dbus? ( >=dev-qt/qtdbus-5.15.4:5 ) fam? ( virtual/fam ) nls? ( >=dev-qt/qttranslations-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcoreaddons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b75d2d61bfb787961530b254fef23136
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.96.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.96.0
new file mode 100644
index 000000000000..d749b939b906
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kcrash-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6e5ff00400b201700c058c162024769c
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.96.0 b/metadata/md5-cache/kde-frameworks/kdav-5.96.0
new file mode 100644
index 000000000000..5433f5a43c88
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/kcoreaddons-5.96:5 >=kde-frameworks/ki18n-5.96:5 >=kde-frameworks/kio-5.96:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/kcoreaddons-5.96:5 >=kde-frameworks/ki18n-5.96:5 >=kde-frameworks/kio-5.96:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdav-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=34b31e872231026799fec2f23f2a7326
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.96.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.96.0
new file mode 100644
index 000000000000..7c4f5eae6ac2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdbusaddons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6e9340f448d5ef98e40549d4b049205b
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.96.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.96.0
new file mode 100644
index 000000000000..70d0b01a0df3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdeclarative-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fdcb70d91ab90a36d7873df6b09d8600
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.96.0 b/metadata/md5-cache/kde-frameworks/kded-5.96.0
new file mode 100644
index 000000000000..1f5d1bb167af
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kinit-5.96*:5 =kde-frameworks/kservice-5.96*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kinit-5.96*:5 =kde-frameworks/kservice-5.96*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kded-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bc7edab9362a6fe3cf53193695cfd18a
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.96.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.96.0
new file mode 100644
index 000000000000..a288d4589907
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-perl/URI >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.96:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qttest-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 >=kde-frameworks/kded-5.96:5 =kde-frameworks/kdoctools-5.96*:5 =kde-frameworks/kemoticons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5[X=] =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kunitconversion-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X=] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.4:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qttest-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 >=kde-frameworks/kded-5.96:5 =kde-frameworks/kdoctools-5.96*:5 =kde-frameworks/kemoticons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5[X=] =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kunitconversion-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X=] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/countryflags-5.96:5 =kde-frameworks/kinit-5.96*:5 =kde-frameworks/kitemmodels-5.96*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aa6ec0362eac4f928a5b0758cd7b4b2b
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.96.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.96.0
new file mode 100644
index 000000000000..9dc23e4a7de7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kpty-5.96*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kpty-5.96*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdesu-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6b6fc495ae1a09108ce62b81cfa93825
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.96.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.96.0
new file mode 100644
index 000000000000..78a25b8e5a72
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.4:5 zeroconf? ( >=dev-qt/qtdbus-5.15.4:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.4:5 zeroconf? ( >=dev-qt/qtdbus-5.15.4:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdnssd-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5b96803cb6f8e7e5623b96b87d63cbd1
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.96.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.96.0
new file mode 100644
index 000000000000..4d1c0aa185ea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.96*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.96*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kdoctools-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=12fbf34a9814514321c879f4668f3dff
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.96.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.96.0
new file mode 100644
index 000000000000..b7e422a9c523
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kservice-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kservice-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kemoticons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f4cc22ae1bf4d28cf5daac235492de0c
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.96.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.96.0
new file mode 100644
index 000000000000..95f9955b4cbd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) mobi? ( kde-apps/kdegraphics-mobipocket:5 ) office? ( =kde-frameworks/karchive-5.96*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org optfeature python-any-r1
+IUSE=epub exif ffmpeg mobi office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) mobi? ( kde-apps/kdegraphics-mobipocket:5 ) office? ( =kde-frameworks/karchive-5.96*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kfilemetadata-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e52dba563c8162b665c3ae845b94b1a
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.96.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.96.0
new file mode 100644
index 000000000000..0d6f8588e6f7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 =kde-frameworks/kdeclarative-5.96*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kglobalaccel-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3375fd2b5b6f8aa26f567c9d5e79182f
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.96.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.96.0
new file mode 100644
index 000000000000..01a179cb3232
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=wayland? ( >=dev-qt/qtwaylandscanner-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.4:5=[wayland] >=dev-qt/qtwayland-5.15.4:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) x11-base/xorg-proto wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) X? ( x11-libs/libxcb ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.4:5=[wayland] >=dev-qt/qtwayland-5.15.4:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kguiaddons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=afd0827167119f8340637bcfe9be930e
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.96.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.96.0
new file mode 100644
index 000000000000..99a5dc9d4e3c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kholidays-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e143c8dd11c9862f48c8879bec64d68e
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.96.0 b/metadata/md5-cache/kde-frameworks/khtml-5.96.0
new file mode 100644
index 000000000000..0abf8df0becd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-util/gperf >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.4:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=24d3f3c139c81c5800f59c159d2aa9c0
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.96.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.96.0
new file mode 100644
index 000000000000..cba5f2b59316
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.96.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-qt/qtdeclarative-5.15.4:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org python-single-r1
+IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-qt/qtdeclarative-5.15.4:5 sys-devel/gettext virtual/libintl app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/ki18n-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eba041c7b9c0ebafc31f10b193b69959
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.96.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.96.0
new file mode 100644
index 000000000000..2b5fb0092ad4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kiconthemes-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=476432f75619b60950ca5016915f60fd
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.96.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.96.0
new file mode 100644
index 000000000000..2fa4c598bde9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.4:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.4:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kidletime-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dc3f61141d2053e4b10c8feec66df896
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.96.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.96.0
new file mode 100644
index 000000000000..cf8b97789d1e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/karchive-5.96*:5 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtprintsupport-5.15.4:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) jpegxl? ( media-libs/libjxl ) openexr? ( >=media-libs/openexr-3:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=avif eps heif jpegxl openexr test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 =kde-frameworks/karchive-5.96*:5 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtprintsupport-5.15.4:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) jpegxl? ( media-libs/libjxl ) openexr? ( >=media-libs/openexr-3:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kimageformats-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0eace18396fa305e4569546041708057
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.96.0 b/metadata/md5-cache/kde-frameworks/kinit-5.96.0
new file mode 100644
index 000000000000..e4cb183b9fbe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kinit-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8745b6bb3f6f9cbb6ad4a50c2f7ff883
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.96.0 b/metadata/md5-cache/kde-frameworks/kio-5.96.0
new file mode 100644
index 000000000000..8d845a471b43
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.96.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=dev-qt/qtconcurrent-5.15.4:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org xdg-utils
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.96:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kio-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=39bb90b8bb4246f655dd978a48cccb90
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.96.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.96.0
new file mode 100644
index 000000000000..0aa8608328bc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15.4:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=8
+HOMEPAGE=https://techbase.kde.org/Kirigami
+INHERIT=ecm kde.org
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtgraphicaleffects-5.15.4:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kirigami2-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7b6d7c760ec2e8f11dbf16be0a9d4941
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.96.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.96.0
new file mode 100644
index 000000000000..93ad790a5b80
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kitemmodels-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4c385f05c1c9fa69b80cabc5f60b838f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.96.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.96.0
new file mode 100644
index 000000000000..c4246af4b3fe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kitemviews-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4a168251b9b4400150b6d99345503230
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.96.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.96.0
new file mode 100644
index 000000000000..f6d94b690d38
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kjobwidgets-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=29088cdb5beb8cea33cd21ecbb12ea36
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.96.0 b/metadata/md5-cache/kde-frameworks/kjs-5.96.0
new file mode 100644
index 000000000000..7bed56175142
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.96:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/kjs-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=17ef7dbca06950eb7b1b7fb17b4b01de
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.96.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.96.0
new file mode 100644
index 000000000000..0008c698c991
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/attica-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 opds? ( =kde-frameworks/syndication-5.96*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=opds debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/attica-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 opds? ( =kde-frameworks/syndication-5.96*:5 ) >=kde-frameworks/kirigami-5.96:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/knewstuff-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8399db101ea4d2455022e3c1a2824c12
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.96.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.96.0
new file mode 100644
index 000000000000..80278d79e0ce
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) speech? ( >=dev-qt/qtspeech-5.15.4:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=dbus nls phonon qml speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) speech? ( >=dev-qt/qtspeech-5.15.4:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/knotifications-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ce31b951bdf77fc70b06b7be1b99dc74
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.96.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.96.0
new file mode 100644
index 000000000000..3dfeb45f02fb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/knotifyconfig-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a9c52d53714bd1fd3d181430431c8e42
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.96.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.96.0
new file mode 100644
index 000000000000..559613917561
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kpackage-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=57dc0bdee6d8845731a7509da6006b9c
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.96.0 b/metadata/md5-cache/kde-frameworks/kparts-5.96.0
new file mode 100644
index 000000000000..616f4c7fb213
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/ktextwidgets-5.96:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kparts-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a51703dd8dff0b9c940ef82f7e5933d9
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.96.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.96.0
new file mode 100644
index 000000000000..0d03dd8127d1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kpeople
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kpeople-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d0af13dffb923d090fe804e5a55e86f5
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.96.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.96.0
new file mode 100644
index 000000000000..a9fbf7fbd398
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kplotting-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6079169b5a2bfd1609aa80525b6fd3f5
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.96.0 b/metadata/md5-cache/kde-frameworks/kpty-5.96.0
new file mode 100644
index 000000000000..90abd16ffa5b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kpty-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=da02d28782d37683a4791d78383add29
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.96.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.96.0
new file mode 100644
index 000000000000..66fbca1fd327
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 examples? ( >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kirigami-5.96*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
+INHERIT=ecm kde.org
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 examples? ( >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kirigami-5.96*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kquickcharts-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ba4fa279509ff10ccd76328cd25e0915
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.96.0 b/metadata/md5-cache/kde-frameworks/kross-5.96.0
new file mode 100644
index 000000000000..13988c8666df
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.96:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtscript-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=dev-qt/designer-5.15.4:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtscript-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/kross-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c84c98ad5ff7d69a24c94b747cadc258
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.96.0 b/metadata/md5-cache/kde-frameworks/krunner-5.96.0
new file mode 100644
index 000000000000..396d1b9977fc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/plasma-5.96*:5 =kde-frameworks/solid-5.96*:5 =kde-frameworks/threadweaver-5.96*:5 activities? ( =kde-frameworks/kactivities-5.96*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=activities test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/plasma-5.96*:5 =kde-frameworks/solid-5.96*:5 =kde-frameworks/threadweaver-5.96*:5 activities? ( =kde-frameworks/kactivities-5.96*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/krunner-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5509034f8b1722255368806a4962259f
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.96.0 b/metadata/md5-cache/kde-frameworks/kservice-5.96.0
new file mode 100644
index 000000000000..2fbf31809098
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 test? ( >=dev-qt/qtconcurrent-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kservice-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f6b61a4d65b3818f2882011e7df1c528
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.96.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.96.0
new file mode 100644
index 000000000000..dd925432c241
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 =kde-frameworks/syntax-highlighting-5.96*:5 editorconfig? ( app-text/editorconfig-core-c ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=+editorconfig test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 =kde-frameworks/syntax-highlighting-5.96*:5 editorconfig? ( app-text/editorconfig-core-c ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/ktexteditor-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f02d838bf1c310db39da80a867502736
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.96.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.96.0
new file mode 100644
index 000000000000..b2663faba75b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/sonnet-5.96*:5 speech? ( >=dev-qt/qtspeech-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/sonnet-5.96*:5 speech? ( >=dev-qt/qtspeech-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/ktextwidgets-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a2f14f0c71173bfd89675ceaded9e61e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.96.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.96.0
new file mode 100644
index 000000000000..683ce072e04f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.4:5 =kde-frameworks/ki18n-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.4:5 =kde-frameworks/ki18n-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kunitconversion-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9aab395adc03d417d73a266d5003f916
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.96.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.96.0
new file mode 100644
index 000000000000..940154f73a29
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org optfeature
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kwallet-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e5d7051718a7527a011825c10c13b71
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.96.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.96.0
new file mode 100644
index 000000000000..a22b28199905
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.4:5 >=dev-util/wayland-scanner-1.19.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[egl] >=dev-qt/qtwayland-5.15.4:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-libs/wayland-protocols-1.15 sys-kernel/linux-headers test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kwayland
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[egl] >=dev-qt/qtwayland-5.15.4:5 media-libs/libglvnd >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kwayland-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d1a9b80cb17c9e5e4baa39103a4b0b83
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.96.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.96.0
new file mode 100644
index 000000000000..75c6d255478b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kwidgetsaddons-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e8203129597191b5f45ab4232ada681
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.96.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.96.0
new file mode 100644
index 000000000000..2c9e80ab01e4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kwindowsystem-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3f24fde4d2c834d617ba570eb94f3c7c
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.96.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.96.0
new file mode 100644
index 000000000000..5b485c9e14dc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.4:5= >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.4:5= >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/kxmlgui-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=652bd4828ed3cec2c6c1a2ca2848a85c
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.96.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.96.0
new file mode 100644
index 000000000000..5d2ce8d450fd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/modemmanager-qt-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7866ef635f71e46117cafd47bb47e818
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.96.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.96.0
new file mode 100644
index 000000000000..cd6f75a8be06
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/networkmanager-qt-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9595150e73ec49431852f6f09d20a80e
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.96.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.96.0
new file mode 100644
index 000000000000..119f46548f0f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.96.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/qtcore-5.15.4:5 >=kde-frameworks/extra-cmake-modules-5.96:5 test? ( app-misc/fdupes ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.15.4:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=cmake kde.org xdg-utils
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/oxygen-icons5-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=48e4fb66c22f83d4c8cd5862cb46dabf
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.96.0 b/metadata/md5-cache/kde-frameworks/plasma-5.96.0
new file mode 100644
index 000000000000..8d864362e54f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kactivities-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5[qml] =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.96*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=gles2-only man wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kactivities-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kconfig-5.96*:5[qml] =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kdeclarative-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kpackage-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.96*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/plasma-framework-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e8a3186b5c7eb9180cc3b6f196e85c55
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.96.0 b/metadata/md5-cache/kde-frameworks/prison-5.96.0
new file mode 100644
index 000000000000..84940ed6be76
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( >=dev-qt/qtwidgets-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/prison
+INHERIT=ecm kde.org
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtmultimedia-5.15.4:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/prison-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d8ace0c55d01b43d2f42d11aca5622fd
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.96.0 b/metadata/md5-cache/kde-frameworks/purpose-5.96.0
new file mode 100644
index 000000000000..d700a1758a04
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/prison-5.96*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org optfeature xdg-utils
+IUSE=bluetooth +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/prison-5.96*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kdeclarative-5.96:5 bluetooth? ( =kde-frameworks/bluez-qt-5.96*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/purpose-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1de402e442817b9039be500c69b5f140
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.96.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.96.0
new file mode 100644
index 000000000000..b6569202de1a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5= >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/sonnet-5.96*:5[qml] test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5= >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kirigami-5.96*:5 =kde-frameworks/sonnet-5.96*:5[qml] >=dev-qt/qtgraphicaleffects-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/qqc2-desktop-style-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=94a488c6927e4ccaac9bc04892266e6a
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.96.0 b/metadata/md5-cache/kde-frameworks/solid-5.96.0
new file mode 100644
index 000000000000..73d1cd2c19a2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org optfeature
+IUSE=ios nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/solid-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1de16af6f68fe539dca4e187c7b3423d
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.96.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.96.0
new file mode 100644
index 000000000000..e586549f63ea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=aspell +hunspell nls qml test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) qml? ( >=dev-qt/qtdeclarative-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/sonnet-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9f03977bc6071f5e47f6ba057869d3de
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.96.0 b/metadata/md5-cache/kde-frameworks/syndication-5.96.0
new file mode 100644
index 000000000000..94741b7d9485
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 test? ( >=dev-qt/qtnetwork-5.15.4:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kcodecs-5.96*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/syndication-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=abf59f04214c99294488261cb9bcac3c
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.96.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.96.0
new file mode 100644
index 000000000000..717a7c3f3ee5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtxmlpatterns-5.15.4:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtxmlpatterns-5.15.4:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/syntax-highlighting-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0b17d2ab8bff312b9468a6769336c0cb
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.96.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.96.0
new file mode 100644
index 000000000000..f59218bd4e08
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.96.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+INHERIT=ecm kde.org
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.96
+SRC_URI=mirror://kde/stable/frameworks/5.96/threadweaver-5.96.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=af8a46beca196b8afe5eed929cef8338
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4fa2bc937f34..8f9d07841286 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/blender-3.2.1 b/metadata/md5-cache/media-gfx/blender-3.2.1
new file mode 100644
index 000000000000..a90376ba8c58
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-3.2.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=8
+HOMEPAGE=https://www.blender.org
+INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
+RESTRICT=!test? ( test )
+SLOT=3.2
+SRC_URI=https://download.blender.org/source/blender-3.2.1.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.2.0-tests.tar.xz )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=323f3ab1e566b9d8c2561bcb9cf930f1
diff --git a/metadata/md5-cache/media-gfx/exif-0.6.22-r1 b/metadata/md5-cache/media-gfx/exif-0.6.22-r1
new file mode 100644
index 000000000000..cd078d6cfac6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/exif-0.6.22-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure
+DEPEND=dev-libs/popt >=media-libs/libexif-0.6.22
+DESCRIPTION=Small CLI util to show EXIF infos hidden in JPEG files
+EAPI=8
+HOMEPAGE=https://libexif.github.io/ https://github.com/libexif/exif
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/popt >=media-libs/libexif-0.6.22
+SLOT=0
+SRC_URI=https://github.com/libexif/exif/releases/download/exif-0_6_22-release/exif-0.6.22.tar.gz
+_md5_=a0b4936587e3241550d6b2abda10265e
diff --git a/metadata/md5-cache/media-gfx/freecad-0.20 b/metadata/md5-cache/media-gfx/freecad-0.20
new file mode 100644
index 000000000000..c3c0cbb4d614
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/freecad-0.20
@@ -0,0 +1,17 @@
+BDEPEND=app-text/dos2unix dev-lang/swig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-libs/boost:=[python,threads(+),python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) >=dev-cpp/eigen-3.3.1:3
+DESCRIPTION=QT based Computer Aided Design application
+EAPI=8
+HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
+INHERIT=check-reqs cmake optfeature python-single-r1 xdg
+IUSE=debug headless test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud pcl plot ship python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=LGPL-2 CC-BY-SA-4.0
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-libs/boost:=[python,threads(+),python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) inspection? ( points ) path? ( robot ) ship? ( image plot )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.20.tar.gz -> freecad-0.20.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=45c785e826b37861862ddb68c789b1f7
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.32 b/metadata/md5-cache/media-gfx/gimp-2.10.32
index 34a1d9bbd2e5..ffe5a6de4279 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.32
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.32
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gimp.org/
 INHERIT=autotools gnome2 toolchain-funcs virtualx
 IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.32.tar.bz2
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=33b5f940d33aa9d19dc6f9c60117c599
+_md5_=6c1c7e2c152ccde2fbdfdffcad3f1d4f
diff --git a/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123 b/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123
deleted file mode 100644
index da2e849bc502..000000000000
--- a/metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK image viewer for comic book archives
-EAPI=7
-HOMEPAGE=https://github.com/multiSnow/mcomix3
-INHERIT=desktop python-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/libjpeg-turbo:0
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/multiSnow/mcomix3/archive/cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8.tar.gz -> mcomix-1.3.0_pre20201123.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=851d8a83d688eae55370462136ee10ff
diff --git a/metadata/md5-cache/media-gfx/mcomix-2.0.2 b/metadata/md5-cache/media-gfx/mcomix-2.0.2
new file mode 100644
index 000000000000..6dbb4c772832
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/mcomix-2.0.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+DESCRIPTION=GTK image viewer for comic book archives
+EAPI=8
+HOMEPAGE=http://mcomix.sourceforge.net
+INHERIT=distutils-r1 optfeature xdg
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/mcomix/mcomix-2.0.2.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=48b1dbcf913be0118aa1ecde67df724e
diff --git a/metadata/md5-cache/media-gfx/mcomix-9999 b/metadata/md5-cache/media-gfx/mcomix-9999
index 9c7de82ae1e7..92394dbcff3e 100644
--- a/metadata/md5-cache/media-gfx/mcomix-9999
+++ b/metadata/md5-cache/media-gfx/mcomix-9999
@@ -1,15 +1,16 @@
-BDEPEND=sys-devel/gettext >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 DESCRIPTION=GTK image viewer for comic book archives
 EAPI=8
-HOMEPAGE=https://github.com/multiSnow/mcomix3
-INHERIT=desktop git-r3 python-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+HOMEPAGE=http://mcomix.sourceforge.net
+INHERIT=distutils-r1 git-r3 optfeature xdg
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libjpeg-turbo:0
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=249b832e2faf40894b348505c60d8f1f
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fcf8ff7a4479151f1b9179840f88c25c
diff --git a/metadata/md5-cache/media-gfx/potrace-1.15 b/metadata/md5-cache/media-gfx/potrace-1.15
deleted file mode 100644
index b8f1e278cf3c..000000000000
--- a/metadata/md5-cache/media-gfx/potrace-1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/zlib
-DESCRIPTION=Transforming bitmaps into vector graphics
-EAPI=6
-HOMEPAGE=http://potrace.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=metric static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=536114de09e500f97514732053b8ff93
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.18-r2 b/metadata/md5-cache/media-gfx/renderdoc-1.18-r2
deleted file mode 100644
index 5e418fe2529a..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.18-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-INHERIT=autotools cmake optfeature python-single-r1 docs qmake-utils xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.18.tar.gz -> renderdoc-1.18.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9de4599727bcb53f394f19299ace464
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.19 b/metadata/md5-cache/media-gfx/renderdoc-1.19
deleted file mode 100644
index e8f280dbc3a5..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-INHERIT=autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.19.tar.gz -> renderdoc-1.19.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.19/v1.19.tar.gz.asc -> renderdoc-1.19.tar.gz.asc )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c20e8b9980959bae9c0687d86b4d4eca
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.3 b/metadata/md5-cache/media-gfx/ristretto-0.12.3
new file mode 100644
index 000000000000..d8ab6b3d0063
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.12.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+DESCRIPTION=A fast and lightweight picture viewer for Xfce
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.3.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=141d1bae87954cbaef74f9bd29070034
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d258085378f2..cb3649edbfcd 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2
new file mode 100644
index 000000000000..1c4f1b6db397
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) )
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
+IUSE=alisp debug doc python +thread-safety 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 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.2.tar.bz2
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f91a44c210414deb5c35d22a836bdc08
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
new file mode 100644
index 000000000000..33b106a2b56a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!<media-libs/alsa-lib-1.2.1
+DESCRIPTION=ALSA ucm configuration files
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!<media-libs/alsa-lib-1.2.1
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.7.2.tar.bz2
+_md5_=e73e19644467ea04d203459687f659fd
diff --git a/metadata/md5-cache/media-libs/babl-0.1.92 b/metadata/md5-cache/media-libs/babl-0.1.92
index 31589e896180..8bcb1d686992 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.92
+++ b/metadata/md5-cache/media-libs/babl-0.1.92
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gegl.org/babl/
 INHERIT=meson gnome2-utils vala
 IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://ftp.gimp.org/pub/babl/0.1/babl-0.1.92.tar.xz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7a8621179f72a9076c097f3a0e8346fd
+_md5_=5c4eb9dd475a47b25c6f0485a4258b39
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2 b/metadata/md5-cache/media-libs/codec2-1.0.4
similarity index 56%
rename from metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
rename to metadata/md5-cache/media-libs/codec2-1.0.4
index 0ff1e275001b..204582ee652b 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
+++ b/metadata/md5-cache/media-libs/codec2-1.0.4
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A compact general purpose allocator with excellent performance
+DESCRIPTION=Low bit rate speech codec
 EAPI=8
-HOMEPAGE=https://github.com/microsoft/mimalloc
+HOMEPAGE=https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2
 INHERIT=cmake-multilib
-IUSE=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
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz -> mimalloc-2.0.5.tar.gz
+IUSE=examples 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RESTRICT=test
+SLOT=0/1.0
+SRC_URI=https://github.com/drowe67/codec2/archive/v1.0.4.tar.gz -> codec2-1.0.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2442b3f6ea90c2606ae1ca28723aed56
+_md5_=30c223c368a04eec33638396c8b62d18
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.36-r1 b/metadata/md5-cache/media-libs/gegl-0.4.36-r1
index 3e9176dda9ab..3ce6b01ed862 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.36-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.4.36-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gegl.org/
 INHERIT=meson optfeature python-any-r1 vala
 IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-3+ LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.90[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.36.tar.xz
 _eclasses_=meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8
-_md5_=2c6bc219bf6ef092f45900735f8027fb
+_md5_=e85f577ac869fbdf52da4c0392973893
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.1.5 b/metadata/md5-cache/media-libs/gmmlib-22.1.5
new file mode 100644
index 000000000000..b145ba0006ab
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gmmlib-22.1.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Intel Graphics Memory Management Library
+EAPI=8
+HOMEPAGE=https://github.com/intel/gmmlib
+INHERIT=cmake
+IUSE=+custom-cflags test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/12.1
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.5.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c01bc2ce8a6b9ef2cd5e127eaa9e6717
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8
index 64287f1e1522..edf7f2c4cc70 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8
@@ -12,5 +12,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a5afa95dafd8cf9a930644d55b6c1192
diff --git a/metadata/md5-cache/media-libs/libdmtx-0.7.7 b/metadata/md5-cache/media-libs/libdmtx-0.7.7
new file mode 100644
index 000000000000..3a7c541666b2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdmtx-0.7.7
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Barcode data matrix reading and writing library
+EAPI=8
+HOMEPAGE=http://libdmtx.sourceforge.net/
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/dmtx/libdmtx/archive/v0.7.7.tar.gz -> libdmtx-0.7.7.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2f3dc14b7d0bb678786aa21e27a0ef58
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2 b/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
deleted file mode 100644
index 0a8f50d1bec0..000000000000
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen >=media-gfx/graphviz-2.26 )
-DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
-EAPI=6
-HOMEPAGE=https://www.videolan.org/libdvbpsi
-IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0/10
-SRC_URI=https://download.videolan.org/pub/libdvbpsi/1.3.2/libdvbpsi-1.3.2.tar.bz2
-_md5_=0bdcb993e227f2685d80bf31aaaf73da
diff --git a/metadata/md5-cache/media-libs/oidn-1.4.3 b/metadata/md5-cache/media-libs/oidn-1.4.3
new file mode 100644
index 000000000000..d0e97590acaa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/oidn-1.4.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/tbb:= dev-lang/ispc
+DESCRIPTION=Intel(R) Open Image Denoise library
+EAPI=8
+HOMEPAGE=https://www.openimagedenoise.org/
+INHERIT=cmake python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/tbb:= dev-lang/ispc
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/OpenImageDenoise/oidn/releases/download/v1.4.3/oidn-1.4.3.src.tar.gz -> oidn-1.4.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=939bde71a26074d65349a68929dbc5d7
diff --git a/metadata/md5-cache/media-libs/osl-1.11.17.0-r4 b/metadata/md5-cache/media-libs/osl-1.11.17.0-r4
index 1f7f369875eb..32a330e380d6 100644
--- a/metadata/md5-cache/media-libs/osl-1.11.17.0-r4
+++ b/metadata/md5-cache/media-libs/osl-1.11.17.0-r4
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=dev-libs/imath-3.1.4-r2:= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-15:= sys-libs/zlib partio? ( media-libs/partio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !!sys-devel/llvm:0
+DEPEND=<dev-libs/libfmt-9.0.0 dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=dev-libs/imath-3.1.4-r2:= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-15:= sys-libs/zlib partio? ( media-libs/partio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !!sys-devel/llvm:0
 DESCRIPTION=Advanced shading language for production GI renderers
 EAPI=7
 HOMEPAGE=http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage
@@ -8,10 +8,10 @@ INHERIT=cmake llvm toolchain-funcs python-single-r1
 IUSE=doc partio qt5 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=dev-libs/imath-3.1.4-r2:= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-15:= sys-libs/zlib partio? ( media-libs/partio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RDEPEND=<dev-libs/libfmt-9.0.0 dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=dev-libs/imath-3.1.4-r2:= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-15:= sys-libs/zlib partio? ( media-libs/partio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0/11.1
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.11.17.0.tar.gz -> osl-1.11.17.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2df2c4b456a2dce85d2c02650fa1811
+_md5_=53800b0eadb50acb8026d72a0cb2af9a
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 42e60b8d2087..d274e39f9dbb 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/x42-plugins-20220327 b/metadata/md5-cache/media-plugins/x42-plugins-20220327
deleted file mode 100644
index 80c4a45e206b..000000000000
--- a/metadata/md5-cache/media-plugins/x42-plugins-20220327
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango sys-apps/help2man
-DESCRIPTION=Collection of LV2 plugins
-EAPI=8
-HOMEPAGE=https://github.com/x42/x42-plugins
-INHERIT=toolchain-funcs
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://gareus.org/misc/x42-plugins/x42-plugins-20220327.tar.xz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=261a58a75cd036cce494b42a48ccd216
diff --git a/metadata/md5-cache/media-plugins/x42-plugins-20220605 b/metadata/md5-cache/media-plugins/x42-plugins-20220605
index f0e760e7ce4d..07581cebb38a 100644
--- a/metadata/md5-cache/media-plugins/x42-plugins-20220605
+++ b/metadata/md5-cache/media-plugins/x42-plugins-20220605
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of LV2 plugins
 EAPI=8
 HOMEPAGE=https://github.com/x42/x42-plugins
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://gareus.org/misc/x42-plugins/x42-plugins-20220605.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=dae9f0f9fc71d01237bb5ab6cb5a588a
+_md5_=261a58a75cd036cce494b42a48ccd216
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 3e07b08d9dde..822cdb733252 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/abcmidi-2022.06.07 b/metadata/md5-cache/media-sound/abcmidi-2022.06.07
index b90d79ffb85d..70ad35838b5f 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2022.06.07
+++ b/metadata/md5-cache/media-sound/abcmidi-2022.06.07
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2022.06.07.zip
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6472bf39705eebc0d5dee53ab12c1973
+_md5_=383f6d93d617c76dbecf74b406c2cc2d
diff --git a/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2 b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
similarity index 55%
rename from metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2
rename to metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
index 31dd3e7a8a95..a499771da207 100644
--- a/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2
+++ b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
@@ -1,7 +1,8 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile:= ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile:= ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) oss? ( virtual/os-headers )
 DESCRIPTION=A heavily multi-threaded pluggable audio player
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.alsaplayer.org/
 INHERIT=autotools desktop xdg
 IUSE=+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) au
 REQUIRED_USE=|| ( alsa jack nas oss )
 SLOT=0
 SRC_URI=http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=afe1e2bf12ba4091cf0ae07fa14498de
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=87d5d694adaf3dc1218137bdfe06032c
diff --git a/metadata/md5-cache/media-sound/mpd-0.23.8 b/metadata/md5-cache/media-sound/mpd-0.23.8
new file mode 100644
index 000000000000..cc5e691138ed
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.23.8
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.68:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=8
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+INHERIT=flag-o-matic linux-info meson systemd xdg
+IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd test twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) qobuz? ( curl soundcloud ) soundcloud? ( curl qobuz ) udisks? ( dbus ) upnp? ( curl expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.23/mpd-0.23.8.tar.xz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a16a7aefd1a8a2dc1da51aed05ef0119
diff --git a/metadata/md5-cache/media-sound/paprefs-1.2-r1 b/metadata/md5-cache/media-sound/paprefs-1.2-r2
similarity index 97%
rename from metadata/md5-cache/media-sound/paprefs-1.2-r1
rename to metadata/md5-cache/media-sound/paprefs-1.2-r2
index 7ff43a49399a..0fef18c49f7b 100644
--- a/metadata/md5-cache/media-sound/paprefs-1.2-r1
+++ b/metadata/md5-cache/media-sound/paprefs-1.2-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/atkmm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 dev-l
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/paprefs/paprefs-1.2.tar.xz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4bc389668b7983194f0f38b057b2ac9c
+_md5_=8f052ef699cb830b28eae266c04684e8
diff --git a/metadata/md5-cache/media-sound/pasystray-0.8.0-r1 b/metadata/md5-cache/media-sound/pasystray-0.8.0-r1
index 4f39ac871cca..573cbc4eba81 100644
--- a/metadata/md5-cache/media-sound/pasystray-0.8.0-r1
+++ b/metadata/md5-cache/media-sound/pasystray-0.8.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/christophgysin/pasystray
 INHERIT=autotools xdg
 IUSE=libnotify zeroconf
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib || ( media-sound/pulseaudio-daemon[glib,zeroconf?] <media-sound/pulseaudio-15.99.1[glib,zeroconf?] ) x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( net-dns/avahi ) libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/christophgysin/pasystray/archive/refs/tags/0.8.0.tar.gz -> pasystray-0.8.0.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=10f7881b77880459d0a304cdbdecaef2
+_md5_=b2f4016a3dbdf09a4b4cb1a0bd1adb9f
diff --git a/metadata/md5-cache/media-sound/pulseaudio-16.1 b/metadata/md5-cache/media-sound/pulseaudio-16.1
new file mode 100644
index 000000000000..c77dfb8e91ed
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libpulse-16.1[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(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.1[bluetooth?,glib?,jack?,ofono-headset?] )
+DESCRIPTION=A meta package for PulseAudio (networked sound server)
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+INHERIT=multilib-minimal
+IUSE=bluetooth daemon +glib jack ofono-headset 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=media-libs/libpulse-16.1[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(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.1[bluetooth?,glib?,jack?,ofono-headset?] )
+SLOT=0
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b2fb6350951e90092d4b0887a5a83ceb
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
index 0a121f563ea1..d4d53468a0a8 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -9,10 +9,10 @@ IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdb
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
+RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3407e1da1537dcb5ba2d2e9ca4f59b9
+_md5_=50997aaee6b9371e8365e49533eefa62
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
index 0269ab702895..db36cded32cb 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -9,10 +9,10 @@ IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdb
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
+RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=75fa6241d8ae1516bd071d082e27da75
+_md5_=0837c1f061123fe0cff5af18d7de8498
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
index c83b64b7ceea..b133ea47ae18 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Daemon component of PulseAudio (networked sound server)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -9,10 +9,10 @@ IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdb
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
+RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9d1ae8844dd1a4bddef8109cd4dced6
+_md5_=ae8d036e4126834cb172d3cefb73a22b
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
index a2ecc31e430d..ec2e77c6156a 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-16.1[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=~media-libs/libpulse-16.1[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Daemon component of PulseAudio (networked sound server)
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -9,10 +9,10 @@ IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdb
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-16.1[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) !media-video/pipewire[sound-server(+)] virtual/tmpfiles
+RDEPEND=~media-libs/libpulse-16.1[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) !media-video/pipewire[sound-server(+)] virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=23d9f7170e2f2185970a1dbf717c6262
+_md5_=56e268e0783be0cd13616c82483b145d
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.27 b/metadata/md5-cache/media-sound/qtractor-0.9.27
new file mode 100644
index 000000000000..ab1d521652f1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.27
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
+EAPI=8
+HOMEPAGE=https://qtractor.sourceforge.io
+INHERIT=cmake xdg
+IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dssi? ( ladspa )
+SLOT=0
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.27.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=69e91e2317b7f9ef708faaa16ff0de48
diff --git a/metadata/md5-cache/media-sound/wavpack-5.5.0 b/metadata/md5-cache/media-sound/wavpack-5.5.0
new file mode 100644
index 000000000000..420db7670bc2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/wavpack-5.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=virtual/libiconv-0-r1
+DESCRIPTION=Hybrid lossless audio compression tools
+EAPI=8
+HOMEPAGE=https://www.wavpack.com/
+INHERIT=multilib-minimal
+IUSE=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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=virtual/libiconv-0-r1
+SLOT=0
+SRC_URI=https://github.com/dbry/WavPack/releases/download/5.5.0/wavpack-5.5.0.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a39b7522888e147a81c78d94f724a3a0
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 3cd3c0490d97..662ce0f5d61a 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/devedeng-4.16.0-r2 b/metadata/md5-cache/media-video/devedeng-4.17.0-r1
similarity index 53%
rename from metadata/md5-cache/media-video/devedeng-4.16.0-r2
rename to metadata/md5-cache/media-video/devedeng-4.17.0-r1
index 1ba6c5adfe7d..aef519259c2d 100644
--- a/metadata/md5-cache/media-video/devedeng-4.16.0-r2
+++ b/metadata/md5-cache/media-video/devedeng-4.17.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
 DESCRIPTION=DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)
 EAPI=8
 HOMEPAGE=https://www.rastersoft.com/programas/devede.html
 INHERIT=distutils-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-cdr/cdrtools dev-python/pycairo[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(-)?] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2
+SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.17.0/devedeng-4.17.0.tar.bz2
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a3d8b48dfbed8ad3a5f4eb22546bb361
+_md5_=2b12129a16be1af77af093c97be6deef
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r2 b/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
similarity index 92%
rename from metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r2
rename to metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
index f0eadf6c97c8..136dbdaac2b6 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r2
+++ b/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtsvg:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
+DEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=8
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
 IUSE=dbus debug dvd gui nls pch test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtsvg:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-68.0.0.tar.xz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=94bed707a0f9680f699c2f38ebf4b7e5
+_md5_=e2f677c0de28278f6c9ef96ad0d0c553
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999
index 3b7080fedc8b..a98c948f4bb7 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9999
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtsvg:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
+DEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=8
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
@@ -8,8 +8,8 @@ INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg git-r3
 IUSE=dbus debug dvd gui nls pch test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtsvg:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bf57c8dad76ab3e48b2d77e7a86a0aaa
+_md5_=f4272440d83a905f7a078051db817972
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 7191faaa5364..a7161eb756fa 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -1,17 +1,16 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig test? ( >=dev-util/cmocka-1.0.0 ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.4.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia dev-libs/libcdio:= ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0:= >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] ) gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) sdl? ( media-libs/libsdl2[sound,threads,video] ) vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( >=media-libs/libplacebo-4.192.1:=[vulkan] media-libs/shaderc ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) zimg? ( >=media-libs/zimg-2.9.2 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+BDEPEND=dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
+DEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.4.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia dev-libs/libcdio:= ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0:= >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] ) gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( >=media-libs/lcms-2.6:2 ) >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire:= ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sndio? ( media-sound/sndio ) vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( >=media-libs/libplacebo-4.192.1:=[vulkan] media-libs/shaderc ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) zimg? ( >=media-libs/zimg-2.9.2 ) dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 DESCRIPTION=Media player based on MPlayer and mplayer2
-EAPI=7
+EAPI=8
 HOMEPAGE=https://mpv.io/ https://github.com/mpv-player/mpv
-INHERIT=bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils git-r3
-IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg lua_single_target_luajit lua_single_target_lua5-1 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC
+INHERIT=edo flag-o-matic lua-single optfeature meson pax-utils python-single-r1 toolchain-funcs xdg git-r3
+IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua mmal nvenc openal +opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sndio test tools +uchardet vaapi vdpau +vector vulkan wayland +X +xv zlib zimg lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=LGPL-2.1+ GPL-2+ BSD MIT ISC
 PROPERTIES=live
-RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.4.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia dev-libs/libcdio:= ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0:= >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] ) gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) sdl? ( media-libs/libsdl2[sound,threads,video] ) vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( >=media-libs/libplacebo-4.192.1:=[vulkan] media-libs/shaderc ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) zimg? ( >=media-libs/zimg-2.9.2 ) nvenc? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) egl? ( || ( gbm X wayland ) ) gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( opengl ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.4.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia dev-libs/libcdio:= ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0:= >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] ) gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( >=media-libs/lcms-2.6:2 ) >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire:= ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sndio? ( media-sound/sndio ) vaapi? ( x11-libs/libva:=[drm(+)?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( >=media-libs/libplacebo-4.192.1:=[vulkan] media-libs/shaderc ) wayland? ( >=dev-libs/wayland-1.6.0 >=dev-libs/wayland-protocols-1.14 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) zimg? ( >=media-libs/zimg-2.9.2 ) nvenc? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) egl? ( || ( gbm X wayland ) ) gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( opengl ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://waf.io/waf-2.0.22
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cb16ffb74b9809b37c6b7b29e65187f6
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=60d14daba1fd1808a9c3131c7449f024
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.54 b/metadata/md5-cache/media-video/pipewire-0.3.54
new file mode 100644
index 000000000000..d2d1bd504f39
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.54
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) 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 ) lv2? ( media-libs/lilv ) 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(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( 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(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) 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 ) lv2? ( media-libs/lilv ) 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(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( 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(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.54/pipewire-0.3.54.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	meson	2cc95670908abda0d67e9e16a6b4341e	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=dc9b703a9d49c80dd87ea61fe97c9f9e
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.54-r1 b/metadata/md5-cache/media-video/pipewire-0.3.54-r1
new file mode 100644
index 000000000000..4a0e3071221e
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.54-r1
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) 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 ) lv2? ( media-libs/lilv ) 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(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( 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(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) 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 ) lv2? ( media-libs/lilv ) 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(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( 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(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.54/pipewire-0.3.54.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	meson	2cc95670908abda0d67e9e16a6b4341e	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=8ee7e4e5b7c013ac38ea9c8154bacfb2
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index f788328a2161..2bfdd34ef6b3 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-serve
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2cc95670908abda0d67e9e16a6b4341e	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=90e96e3ddda470988e37f37b1b15238a
+_md5_=dc9b703a9d49c80dd87ea61fe97c9f9e
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r4 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r4
index 94bd9d9bed8d..d6a72dc24341 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r4
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.10-r4
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Replacement for pipewire-media-session
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
@@ -8,10 +8,10 @@ INHERIT=lua-single meson systemd
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=4bfc273ee66e387fbc34af8d20bf2776
+_md5_=03fb8fa183b6f4a6f45aa77bc0107b0a
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r6 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r6
index ec257f773319..37232a200acc 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r6
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.10-r6
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Replacement for pipewire-media-session
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
@@ -8,10 +8,10 @@ INHERIT=lua-single meson systemd
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=ed21f88b1158aea6906958ee1629ec1d
+_md5_=bdfeedc5bd69e0b4c2c9495d9a459e89
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11 b/metadata/md5-cache/media-video/wireplumber-0.4.11
new file mode 100644
index 000000000000..a9ebbfce16dc
--- /dev/null
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.11
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Replacement for pipewire-media-session
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
+INHERIT=lua-single meson systemd
+IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=eb5543bde8e42eabb944fbdacf6722cb
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11-r1 b/metadata/md5-cache/media-video/wireplumber-0.4.11-r1
new file mode 100644
index 000000000000..33c853c4e232
--- /dev/null
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.11-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Replacement for pipewire-media-session
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
+INHERIT=lua-single meson systemd
+IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c93fcc7533977025409976031d5cdefa
diff --git a/metadata/md5-cache/media-video/wireplumber-9999 b/metadata/md5-cache/media-video/wireplumber-9999
index 3971cb839528..98010ca7ebe3 100644
--- a/metadata/md5-cache/media-video/wireplumber-9999
+++ b/metadata/md5-cache/media-video/wireplumber-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Replacement for pipewire-media-session
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
@@ -8,9 +8,9 @@ INHERIT=lua-single meson systemd git-r3
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=ead6c74f11ab0aa460e4a8b140c22182
+_md5_=c88333c23e1079102a318ab8da0e0e8d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e9b142f33211..1775d1847b16 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r1 b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
deleted file mode 100644
index 4c37f38b8b7e..000000000000
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Ultrafast implementation of ping
-EAPI=6
-HOMEPAGE=http://apenwarr.ca/netselect/
-INHERIT=toolchain-funcs
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/netselect-0.4-ipv6.patch.xz )
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1249a2a3ca9d765c30c79981244c46d8
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.7-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.7.7-r1
new file mode 100644
index 000000000000..500790a810a4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.7.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+DESCRIPTION=A network tool to gather IP traffic information
+EAPI=8
+HOMEPAGE=http://www.pmacct.net/
+INHERIT=autotools toolchain-funcs systemd
+IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
+SLOT=0
+SRC_URI=https://github.com/pmacct/pmacct/releases/download/v1.7.7/pmacct-1.7.7.tar.gz http://www.pmacct.net/pmacct-1.7.7.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d32421f4ec537ab34245d645c12ed34b
diff --git a/metadata/md5-cache/net-analyzer/pmacct-999999 b/metadata/md5-cache/net-analyzer/pmacct-9999
similarity index 67%
rename from metadata/md5-cache/net-analyzer/pmacct-999999
rename to metadata/md5-cache/net-analyzer/pmacct-9999
index 759c769d2515..8bca73bd1b4f 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-999999
+++ b/metadata/md5-cache/net-analyzer/pmacct-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
 DESCRIPTION=A network tool to gather IP traffic information
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.pmacct.net/
-INHERIT=autotools flag-o-matic git-r3 toolchain-funcs
+INHERIT=autotools toolchain-funcs systemd git-r3
 IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
 REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
 SLOT=0
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=13d765b1eca9d97c05ff307b6bc9672c
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d32421f4ec537ab34245d645c12ed34b
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.1.3 b/metadata/md5-cache/net-analyzer/wapiti-3.1.3
new file mode 100644
index 000000000000..e8c16402854f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.1.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/socksio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tld[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/yaswfp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-cov[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml] ) >=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=Web-application vulnerability scanner
+EAPI=8
+HOMEPAGE=http://wapiti.sourceforge.net/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/socksio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tld[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/yaswfp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.1.3.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c0b1b2000ef533545fcf56ba05be47bd
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index f7ecc6c0d941..f0e2b62c8859 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.7.1 b/metadata/md5-cache/net-dns/pdns-recursor-4.7.1
new file mode 100644
index 000000000000..60a85c63d4dc
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.7.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) elibc_glibc? ( arm? ( >=sys-libs/glibc-2.34 ) x86? ( >=sys-libs/glibc-2.34 ) ) dev-libs/openssl:= >=dev-libs/boost-1.35:=[context]
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+INHERIT=flag-o-matic lua-single
+IUSE=debug dnstap snmp sodium systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) elibc_glibc? ( arm? ( >=sys-libs/glibc-2.34 ) x86? ( >=sys-libs/glibc-2.34 ) ) dev-libs/openssl:= >=dev-libs/boost-1.35:=[context] !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.7.1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e73c4419b756c36a251568d87450038a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c4bca3d6151c..3a727971d839 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/bitlbee-3.6-r1 b/metadata/md5-cache/net-im/bitlbee-3.6-r1
index 5768ddfe54aa..a10ee7c4b4d5 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.6-r1
+++ b/metadata/md5-cache/net-im/bitlbee-3.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install setup
 DEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
 DESCRIPTION=irc to IM gateway that support multiple IM protocols
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2d259a34b84022e6c80a0e5616073e11
+_md5_=55729bf158ce5812e882c00a05c23168
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index c5858e906200..8ade7129a548 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup unpack
 DEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
 DESCRIPTION=irc to IM gateway that support multiple IM protocols
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d8c2a3d87f515b6561abc2c532d4a401
+_md5_=8cc6a1e42917e37f13824fbd9af74bf3
diff --git a/metadata/md5-cache/net-im/neochat-22.06 b/metadata/md5-cache/net-im/neochat-22.06
new file mode 100644
index 000000000000..abe83d5e2e26
--- /dev/null
+++ b/metadata/md5-cache/net-im/neochat-22.06
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/cmark:= dev-libs/qcoro5 dev-libs/qtkeychain:= >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtmultimedia-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.96.0:5 >=kde-frameworks/kconfigwidgets-5.96.0:5 >=kde-frameworks/kcoreaddons-5.96.0:5 >=kde-frameworks/kdbusaddons-5.96.0:5 >=kde-frameworks/ki18n-5.96.0:5 >=kde-frameworks/kio-5.96.0:5 >=kde-frameworks/kirigami-5.96.0:5 >=kde-frameworks/knotifications-5.96.0:5[qml] >=kde-frameworks/kwindowsystem-5.96.0:5 >=kde-frameworks/qqc2-desktop-style-5.96.0:5 media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6 dev-qt/qtcore:5
+DESCRIPTION=Client for Matrix, the decentralized communication protocol
+EAPI=8
+HOMEPAGE=https://apps.kde.org/neochat/
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-text/cmark:= dev-libs/qcoro5 dev-libs/qtkeychain:= >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtmultimedia-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.96.0:5 >=kde-frameworks/kconfigwidgets-5.96.0:5 >=kde-frameworks/kcoreaddons-5.96.0:5 >=kde-frameworks/kdbusaddons-5.96.0:5 >=kde-frameworks/ki18n-5.96.0:5 >=kde-frameworks/kio-5.96.0:5 >=kde-frameworks/kirigami-5.96.0:5 >=kde-frameworks/knotifications-5.96.0:5[qml] >=kde-frameworks/kwindowsystem-5.96.0:5 >=kde-frameworks/qqc2-desktop-style-5.96.0:5 media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtmultimedia-5.15.5:5[qml] >=kde-frameworks/kitemmodels-5.96.0:5[qml] >=kde-frameworks/purpose-5.96.0:5 >=kde-frameworks/sonnet-5.96.0:5[qml] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-mobile/22.06/neochat-22.06.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dd046da92db74301e168468c537f3b1
diff --git a/metadata/md5-cache/net-im/synapse-1.62.0 b/metadata/md5-cache/net-im/synapse-1.62.0
new file mode 100644
index 000000000000..e46fc922e256
--- /dev/null
+++ b/metadata/md5-cache/net-im/synapse-1.62.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/parameterized[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-6[python_targets_python3_9(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-6[python_targets_python3_10(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-user/synapse acct-group/synapse
+DESCRIPTION=Reference implementation of Matrix homeserver
+EAPI=8
+HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-user/synapse acct-group/synapse python_single_target_python3_9? ( dev-python/attrs[python_targets_python3_9(-)] dev-python/bcrypt[python_targets_python3_9(-)] dev-python/bleach[python_targets_python3_9(-)] dev-python/canonicaljson[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] dev-python/frozendict[python_targets_python3_9(-)] dev-python/ijson[python_targets_python3_9(-)] >=dev-python/jinja-3.0[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] >=dev-python/matrix-common-1.2.1[python_targets_python3_9(-)] dev-python/msgpack[python_targets_python3_9(-)] dev-python/netaddr[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] dev-python/phonenumbers[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),webp] dev-python/prometheus_client[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pymacaroons[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/signedjson[python_targets_python3_9(-)] dev-python/sortedcontainers[python_targets_python3_9(-)] dev-python/treq[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/unpaddedbase64[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/attrs[python_targets_python3_10(-)] dev-python/bcrypt[python_targets_python3_10(-)] dev-python/bleach[python_targets_python3_10(-)] dev-python/canonicaljson[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/frozendict[python_targets_python3_10(-)] dev-python/ijson[python_targets_python3_10(-)] >=dev-python/jinja-3.0[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] >=dev-python/matrix-common-1.2.1[python_targets_python3_10(-)] dev-python/msgpack[python_targets_python3_10(-)] dev-python/netaddr[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] dev-python/phonenumbers[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),webp] dev-python/prometheus_client[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pymacaroons[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/signedjson[python_targets_python3_10(-)] dev-python/sortedcontainers[python_targets_python3_10(-)] dev-python/treq[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/unpaddedbase64[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/synapse/archive/v1.62.0.tar.gz -> synapse-1.62.0.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=31f9db24533317e1e6ba231769a8dd6b
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 914dbcfe1871..e0a1c54452ca 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/epic5-2.0.1-r1 b/metadata/md5-cache/net-irc/epic5-2.0.1-r1
deleted file mode 100644
index d8b8d726db06..000000000000
--- a/metadata/md5-cache/net-irc/epic5-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=Epic5 IRC Client
-EAPI=7
-HOMEPAGE=http://epicsol.org/
-IUSE=archive perl tcl ruby socks5 valgrind
-KEYWORDS=amd64 ~ppc ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems )
-SLOT=0
-SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-2.0.1.tar.xz
-_eclasses_=ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed
-_md5_=60df573e9f4b20e8a716d5fdfd76e462
diff --git a/metadata/md5-cache/net-irc/epic5-2.0.1-r2 b/metadata/md5-cache/net-irc/epic5-2.0.1-r2
index 8448ed8839ae..f6d2e297ff9d 100644
--- a/metadata/md5-cache/net-irc/epic5-2.0.1-r2
+++ b/metadata/md5-cache/net-irc/epic5-2.0.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Epic5 IRC Client
 EAPI=7
 HOMEPAGE=http://epicsol.org/
 IUSE=archive perl tcl socks5 valgrind
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-2.0.1.tar.xz
-_md5_=d4306d9e109a7b02311098e8f633ffc8
+_md5_=b7a26ca8a4857218c158204f5d81abc2
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.3 b/metadata/md5-cache/net-irc/irssi-1.2.3
deleted file mode 100644
index a71efc025cc2..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 dev-libs/openssl:= otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-INHERIT=perl-module
-IUSE=otr +perl selinux socks5 +proxy
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 dev-libs/openssl:= otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.3/irssi-1.2.3.tar.xz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=3d62778f2d8b8047ec082fd040a39975
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
index b05ff462b25e..85a66dd167a9 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=94bfdf01e2f9c037191df752c44c6fb8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7d9c46515a4f..6c7a5ec1fadc 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/nDPI-4.4 b/metadata/md5-cache/net-libs/nDPI-4.4
new file mode 100644
index 000000000000..2b29e032a2d3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nDPI-4.4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
+DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
+EAPI=8
+HOMEPAGE=https://www.ntop.org/
+INHERIT=autotools edo
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
+SLOT=0/4
+SRC_URI=https://github.com/ntop/nDPI/archive/4.4.tar.gz -> nDPI-4.4.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3453d5aee8b48f53ff544d15f29fe6b3
diff --git a/metadata/md5-cache/net-libs/nDPI-9999 b/metadata/md5-cache/net-libs/nDPI-9999
index 5cca43ee1c3f..4e37c5d36b8c 100644
--- a/metadata/md5-cache/net-libs/nDPI-9999
+++ b/metadata/md5-cache/net-libs/nDPI-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install prepare test unpack
+DEFINED_PHASES=configure install prepare test unpack
 DEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
 DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
 EAPI=8
 HOMEPAGE=https://www.ntop.org/
-INHERIT=autotools git-r3
+INHERIT=autotools edo git-r3
 LICENSE=LGPL-3+
 PROPERTIES=live
 RDEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
 SLOT=0/9999
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=75c86ccf957bc951d6b21a6445ee27cf
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3453d5aee8b48f53ff544d15f29fe6b3
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
deleted file mode 100644
index 26fad8ddbe1b..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] ) test? ( >=dev-util/cunit-2.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(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-INHERIT=multilib-minimal
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.1/nghttp2-1.45.1.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b4a522f50f3926e6fda38d04a5a29ec3
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-0 b/metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
similarity index 88%
rename from metadata/md5-cache/net-libs/rpcsvc-proto-0
rename to metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
index ce90e9ca4ae1..49fe3a529baa 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-0
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 DESCRIPTION=rpcsvc protocol definitions from glibc
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 SLOT=0
-_md5_=e0f17524aaaa2b09b34d46123dc72c2d
+_md5_=14f1c568197e245e287356aeb950e09c
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
similarity index 90%
rename from metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3
rename to metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
index cc07e6708066..07badddffceb 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
@@ -1,11 +1,11 @@
 BDEPEND=sys-devel/gettext
 DEFINED_PHASES=install prepare
 DESCRIPTION=rpcsvc protocol definitions from glibc
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=!<sys-libs/glibc-2.26 virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4.3/rpcsvc-proto-1.4.3.tar.xz
-_md5_=00117afd6b55392fa7f8fa4f6ae045cf
+_md5_=7b398f0d682bff8a5b827d04c752a2b9
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 61d924a0be4a..ed807e8c4c22 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1
index d12bb8066dc9..b1651d48b729 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.dovecot.org/
 INHERIT=autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
 IUSE=kerberos ldap lua mysql pam postgres sqlite lz4 zstd argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-3
-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=LGPL-2.1 MIT
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.19.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b31441ee2fa9ae47f59e9208001188f1
+_md5_=ad9a768ffc0b0e0c6bb2d7fb0546db1a
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.5 b/metadata/md5-cache/net-mail/mailshears-0.0.5
index 2ec91aaf1978..23d2e4191ff5 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.5
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mailshears-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aaf583f98e44baee8078e7aeefc2b968
diff --git a/metadata/md5-cache/net-mail/mu-1.6.11 b/metadata/md5-cache/net-mail/mu-1.6.11
deleted file mode 100644
index 70eb8b9e023a..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.6.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common
-IUSE=emacs guile readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/1.6.11/mu-1.6.11.tar.xz
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=46e007b83003e743928b7dd1acec4e03
diff --git a/metadata/md5-cache/net-mail/mu-1.7.23 b/metadata/md5-cache/net-mail/mu-1.7.23
deleted file mode 100644
index 8768efeb9ec9..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.7.23
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common meson
-IUSE=emacs readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~matthew/distfiles/mu-1.7.23.tar.xz
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1737d65f212a038196da36b540f114ea
diff --git a/metadata/md5-cache/net-mail/mu-1.8.1 b/metadata/md5-cache/net-mail/mu-1.8.5
similarity index 90%
rename from metadata/md5-cache/net-mail/mu-1.8.1
rename to metadata/md5-cache/net-mail/mu-1.8.5
index fd4f183ce11c..ab5e4c0ef537 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.1
+++ b/metadata/md5-cache/net-mail/mu-1.8.5
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.1/mu-1.8.1.tar.xz
+SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.5/mu-1.8.5.tar.xz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1dc90b478e3622cc8bd133d2fe1ff229
+_md5_=dfa9e0c06815205ff73c0f186524599c
diff --git a/metadata/md5-cache/net-mail/ytnef-1.9.3 b/metadata/md5-cache/net-mail/ytnef-1.9.3
deleted file mode 100644
index 09c64bef91bd..000000000000
--- a/metadata/md5-cache/net-mail/ytnef-1.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/libtool
-DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
-EAPI=7
-HOMEPAGE=https://github.com/Yeraze/ytnef
-INHERIT=autotools
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=dev-perl/MIME-tools
-SLOT=0
-SRC_URI=https://github.com/Yeraze/ytnef/archive/v1.9.3.tar.gz -> ytnef-1.9.3.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=8b346575081523c2e1fdc2219c759ee8
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3ec0f67504d0..f996d8eb18c1 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/felix-3.1.3 b/metadata/md5-cache/net-misc/felix-3.1.3
index 7d8fceec81bf..299f986599c0 100644
--- a/metadata/md5-cache/net-misc/felix-3.1.3
+++ b/metadata/md5-cache/net-misc/felix-3.1.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10 virtual/pkgconfig
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10
 DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/felix
-INHERIT=golang-vcs-snapshot systemd user
+INHERIT=golang-vcs-snapshot
 IUSE=+bird
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.1.3.tar.gz -> felix-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz -> github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz -> github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/opentracing/opentracing-go/archive/6c572c00d1830223701e155de97408483dfcd14a.tar.gz -> github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/projectcalico/typha/archive/5374e9f32bde159a4aa19c821618920f491004be.tar.gz -> github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz -> github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz -> github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=38433d7e4c34ce525f37136a4086f717
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
+_md5_=0c8827362ea8be65b6b477717e37c11d
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5-r1 b/metadata/md5-cache/net-misc/keychain-2.8.5-r1
new file mode 100644
index 000000000000..bb87baed5a99
--- /dev/null
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5-r1
@@ -0,0 +1,10 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install
+DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
+EAPI=8
+HOMEPAGE=https://www.funtoo.org/Keychain
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
+_md5_=ac75ddfcad328a19a7bbe5eb7f2d4657
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.7 b/metadata/md5-cache/net-misc/mikutter-4.1.7
index 0a52a9dde698..e8b149e49ab8 100644
--- a/metadata/md5-cache/net-misc/mikutter-4.1.7
+++ b/metadata/md5-cache/net-misc/mikutter-4.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.7.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc711a61d056d261f2314f092650e6e6
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 79fdf6bdfb6d..04ff4ec3a9b2 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=46a05265b3dc559c3e166e3f611cd3b0
diff --git a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13 b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
index cffe118dd485..5e021c757ae9 100644
--- a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
+++ b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
@@ -5,10 +5,10 @@ DESCRIPTION=Standard Linux telnet client and server
 EAPI=8
 HOMEPAGE=https://launchpad.net/netkit-telnet
 INHERIT=cmake
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd
 SLOT=0
 SRC_URI=mirror://gentoo/netkit-telnet-0.17.tar.gz mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-42.debian.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ac7046b37d7a8bf1b45c789ef4e32452
+_md5_=b80fa2f505d7a10d9a0afc0b62f4c4ba
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.5_p1 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.5_p1
new file mode 100644
index 000000000000..78b0931f23b5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.5_p1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.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=A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio
+EAPI=8
+HOMEPAGE=https://github.com/Cygn/pulseaudio-dlna
+INHERIT=desktop distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/notify2-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyroute2-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pychromecast-10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[cairo,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbus-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zeroconf-0.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/pulseaudio-dlna-0.6.5-1.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c5220b8d6052661300671906fbeb0226
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999 b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
index 752bcb0ca372..6704886543cd 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/notify2-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyroute2-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pychromecast-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dbus-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zeroconf-0.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject[cairo,python_targets_python3_8(-)?,python_targets_python3_9(-)?] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
 DESCRIPTION=A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio
-EAPI=7
-HOMEPAGE=https://github.com/masmu/pulseaudio-dlna
+EAPI=8
+HOMEPAGE=https://github.com/Cygn/pulseaudio-dlna
 INHERIT=desktop distutils-r1 git-r3
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/notify2-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyroute2-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pychromecast-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dbus-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zeroconf-0.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject[cairo,python_targets_python3_8(-)?,python_targets_python3_9(-)?] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/notify2-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyroute2-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pychromecast-10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[cairo,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbus-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zeroconf-0.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d5cb6954292bf2ec32165c959a438e9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c5220b8d6052661300671906fbeb0226
diff --git a/metadata/md5-cache/net-misc/putty-0.76 b/metadata/md5-cache/net-misc/putty-0.76
index 212cf718686b..b54d65c53b42 100644
--- a/metadata/md5-cache/net-misc/putty-0.76
+++ b/metadata/md5-cache/net-misc/putty-0.76
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d9bddedd24cfdf79e67f9822b36eaa5
+_md5_=b6ef734a4b27b81b25b8fbf64acf8d25
diff --git a/metadata/md5-cache/net-misc/putty-0.77 b/metadata/md5-cache/net-misc/putty-0.77-r1
similarity index 76%
rename from metadata/md5-cache/net-misc/putty-0.77
rename to metadata/md5-cache/net-misc/putty-0.77-r1
index ca8ee5b35398..29f6d54ca2c4 100644
--- a/metadata/md5-cache/net-misc/putty-0.77
+++ b/metadata/md5-cache/net-misc/putty-0.77-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/halibut ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils
-IUSE=debug +gtk gtk2 ipv6 gssapi
+IUSE=debug doc +gtk gtk2 ipv6 gssapi
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.77/putty-0.77.tar.gz
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.77/putty-0.77.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6253432cc6e83eaa71c818fff90dd91f
+_md5_=0e9c64b82b20c654e8afa550f896f4a5
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index e0343ef01286..f52a7b39aaab 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/halibut ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils git-r3
-IUSE=debug +gtk gtk2 ipv6 gssapi
+IUSE=debug doc +gtk gtk2 ipv6 gssapi
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6253432cc6e83eaa71c818fff90dd91f
+_md5_=0e9c64b82b20c654e8afa550f896f4a5
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.02 b/metadata/md5-cache/net-misc/r8125-9.009.02
new file mode 100644
index 000000000000..603e0d9afa5c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.009.02
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+INHERIT=linux-info linux-mod
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.02.tar.bz2
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=841d771608bac9b680b88507647c19e3
diff --git a/metadata/md5-cache/net-misc/rclone-1.58.1 b/metadata/md5-cache/net-misc/rclone-1.58.1
index 8a07a154b4b6..1842e988fdde 100644
--- a/metadata/md5-cache/net-misc/rclone-1.58.1
+++ b/metadata/md5-cache/net-misc/rclone-1.58.1
@@ -4,10 +4,10 @@ DESCRIPTION=A program to sync files to and from various cloud storage providers
 EAPI=8
 HOMEPAGE=https://rclone.org/
 INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rclone/rclone/archive/v1.58.1.tar.gz -> rclone-1.58.1.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/rclone/rclone-1.58.1-deps.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c215c3b9ce3f033ddec6f2f5181c7e3e
+_md5_=d3418a96a79e0b2a086b936cf9d6a768
diff --git a/metadata/md5-cache/net-misc/rclone-1.59.0 b/metadata/md5-cache/net-misc/rclone-1.59.0
new file mode 100644
index 000000000000..d5554ffbfc7e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rclone-1.59.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A program to sync files to and from various cloud storage providers
+EAPI=8
+HOMEPAGE=https://rclone.org/
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rclone/rclone/archive/v1.59.0.tar.gz -> rclone-1.59.0.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/rclone/rclone-1.59.0-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c215c3b9ce3f033ddec6f2f5181c7e3e
diff --git a/metadata/md5-cache/net-misc/streamlink-4.1.0-r2 b/metadata/md5-cache/net-misc/streamlink-4.1.0-r2
index 9ea954886055..94e507738192 100644
--- a/metadata/md5-cache/net-misc/streamlink-4.1.0-r2
+++ b/metadata/md5-cache/net-misc/streamlink-4.1.0-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/4.1.0/streamlink-4.1.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=80b65c5dc30fac79e1cd1439b32d8037
+_md5_=3b160a026c555bc7fd16e62f473195ca
diff --git a/metadata/md5-cache/net-misc/streamlink-4.2.0 b/metadata/md5-cache/net-misc/streamlink-4.2.0
new file mode 100644
index 000000000000..763fca20e31d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/streamlink-4.2.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-6[python_targets_python3_8(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-6[python_targets_python3_9(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-6[python_targets_python3_10(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] )
+DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
+EAPI=8
+HOMEPAGE=https://streamlink.github.io/
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 Apache-2.0
+RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/streamlink/streamlink/releases/download/4.2.0/streamlink-4.2.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0e6c604eaa98ebf04f1cecd21fcde115
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index a74ed337ffe6..fa44600656e6 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -1,6 +1,6 @@
-BDEPEND=python_single_target_python3_8? ( dev-python/versioningit[python_targets_python3_8(-)] test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/versioningit[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/versioningit[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-6[python_targets_python3_8(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-6[python_targets_python3_9(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-6[python_targets_python3_10(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_8? ( >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-6[python_targets_python3_8(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-6[python_targets_python3_9(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-6[python_targets_python3_10(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] )
 DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
 EAPI=8
 HOMEPAGE=https://streamlink.github.io/
@@ -8,9 +8,9 @@ INHERIT=git-r3 distutils-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=BSD-2 Apache-2.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] )
+RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] >=dev-python/lxml-4.6.4[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >dev-python/PySocks-1.5.7[python_targets_python3_8(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),threads(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2d0ef543156a91b41c169243c75286bb
+_md5_=0e6c604eaa98ebf04f1cecd21fcde115
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index fe306459f38a..6466e6b50de4 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-7.0.4 b/metadata/md5-cache/net-proxy/mitmproxy-7.0.4
deleted file mode 100644
index b0aec40d497a..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-7.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-5.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=8
-HOMEPAGE=https://mitmproxy.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v7.0.4.tar.gz -> mitmproxy-7.0.4.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=5e5528ebb93943e1594249df37077ba5
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.0.0 b/metadata/md5-cache/net-proxy/mitmproxy-8.0.0
deleted file mode 100644
index 0fc09a55843a..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-8.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=8
-HOMEPAGE=https://mitmproxy.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.0.0.tar.gz -> mitmproxy-8.0.0.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3daca681f630aabd86ea0eb8c1af43a0
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0 b/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
index ec38a34d9092..e8778b4681fb 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
+++ b/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://mitmproxy.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.1.0.tar.gz -> mitmproxy-8.1.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c9160e6dc9e3fb25bade1f2dcc45fdfa
+_md5_=856bd44722d2034466ad188dafaf2e5f
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.1.1 b/metadata/md5-cache/net-proxy/mitmproxy-8.1.1
new file mode 100644
index 000000000000..260328cc96ce
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/mitmproxy-8.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
+EAPI=8
+HOMEPAGE=https://mitmproxy.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.1.1.tar.gz -> mitmproxy-8.1.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e30bd95660c393f76477c95de52bd96a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 481267c52726..0c741393a1d0 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/i2p-1.7.0 b/metadata/md5-cache/net-vpn/i2p-1.7.0
index eafc16c01037..186862b11f42 100644
--- a/metadata/md5-cache/net-vpn/i2p-1.7.0
+++ b/metadata/md5-cache/net-vpn/i2p-1.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://geti2p.net
 INHERIT=java-pkg-2 java-ant-2 systemd
 IUSE=nls test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
 RDEPEND=dev-java/java-service-wrapper:0 acct-user/i2p acct-group/i2p net-libs/nativebiginteger:0 || ( virtual/jre:1.8 virtual/jre:11 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a34b89a497e21f3ce1fca4e3b0adcee3
+_md5_=c8e4551ce027b15f334b022bb47ab847
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 5d778a80ef79..940c5d94d2d2 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.64 b/metadata/md5-cache/net-wireless/bluez-5.64
index b6c70b17ebfc..0f32769f29a4 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.64
+++ b/metadata/md5-cache/net-wireless/bluez-5.64
@@ -1,5 +1,5 @@
 BDEPEND=dev-python/docutils virtual/pkgconfig test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-libs/glib-2.28: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(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 )
 DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.64.tar.xz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=751b7d4d99595b041fed93ef4f64d47a
+_md5_=79a8c589d44563785d1afb2b4c7b9e32
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0 b/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
deleted file mode 100644
index f670f0ec1ea1..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) !!<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=7
-HOMEPAGE=https://www.gnuradio.org/
-INHERIT=cmake python-single-r1 virtualx xdg-utils
-IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
-RESTRICT=test
-SLOT=0/3.8.4.0
-SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.8.4.0.tar.gz -> gnuradio-3.8.4.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5ac01b49738c1e3a4c124a5def2178e3
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 4500967273b5..6bcb583588ef 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/rebase-1901-r1 b/metadata/md5-cache/sci-biology/rebase-1901-r2
similarity index 82%
rename from metadata/md5-cache/sci-biology/rebase-1901-r1
rename to metadata/md5-cache/sci-biology/rebase-1901-r2
index 592b54d4bf16..ad9217bf40ea 100644
--- a/metadata/md5-cache/sci-biology/rebase-1901-r1
+++ b/metadata/md5-cache/sci-biology/rebase-1901-r2
@@ -6,7 +6,8 @@ HOMEPAGE=http://rebase.neb.com
 IUSE=emboss minimal
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
+RDEPEND=emboss? ( sci-biology/emboss )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1901.tar.xz
-_md5_=0d6e32883752d19d6e086fd1a9f809ac
+_md5_=572ea72ec5c0d1c0dcb153e7d16c64e5
diff --git a/metadata/md5-cache/sci-biology/trnascan-se-1.31 b/metadata/md5-cache/sci-biology/trnascan-se-1.31
deleted file mode 100644
index 784ab8931d62..000000000000
--- a/metadata/md5-cache/sci-biology/trnascan-se-1.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=tRNA detection in large-scale genome sequences
-EAPI=6
-HOMEPAGE=http://lowelab.ucsc.edu/tRNAscan-SE/
-INHERIT=perl-functions toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://lowelab.ucsc.edu/software/tRNAscan-SE.tar.gz -> trnascan-se-1.31.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3f4bcdf31fe276f90a95e2f4b311deae
diff --git a/metadata/md5-cache/sci-biology/trnascan-se-1.31-r1 b/metadata/md5-cache/sci-biology/trnascan-se-1.31-r2
similarity index 77%
rename from metadata/md5-cache/sci-biology/trnascan-se-1.31-r1
rename to metadata/md5-cache/sci-biology/trnascan-se-1.31-r2
index ca9a83d24809..e0434ace0e21 100644
--- a/metadata/md5-cache/sci-biology/trnascan-se-1.31-r1
+++ b/metadata/md5-cache/sci-biology/trnascan-se-1.31-r2
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install prepare test
+BDEPEND=dev-lang/perl:=
+DEFINED_PHASES=configure install test
 DESCRIPTION=tRNA detection in large-scale genome sequences
 EAPI=8
 HOMEPAGE=http://lowelab.ucsc.edu/tRNAscan-SE/
 INHERIT=perl-functions toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=http://lowelab.ucsc.edu/software/tRNAscan-SE.tar.gz -> trnascan-se-1.31.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b45bfcb4533095fbe49a52b53d689693
+_md5_=573bacb37768044a51d4a9ab21cdcf8c
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 8dc1ff4e7300..f1c22e6c63bc 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27 b/metadata/md5-cache/sci-electronics/klayout-0.27
deleted file mode 100644
index cc4f39255286..000000000000
--- a/metadata/md5-cache/sci-electronics/klayout-0.27
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
-EAPI=7
-HOMEPAGE=https://www.klayout.de/
-INHERIT=toolchain-funcs python-single-r1 ruby-ng
-IUSE=python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby26
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c52b652742bd3de97d72ac8ae0a7bcf0
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27.3 b/metadata/md5-cache/sci-electronics/klayout-0.27.10
similarity index 56%
rename from metadata/md5-cache/sci-electronics/klayout-0.27.3
rename to metadata/md5-cache/sci-electronics/klayout-0.27.10
index 7a4032036708..07df3ac5b444 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27.3
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27.10
@@ -1,16 +1,16 @@
 BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=7
 HOMEPAGE=https://www.klayout.de/
 INHERIT=toolchain-funcs python-single-r1 ruby-ng
-IUSE=python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby27
-KEYWORDS=amd64 ~x86
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ruby_targets_ruby27
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby27 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
-SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=f239887cb4045139582a3e5a9671489b
+SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a8ef0bfee1e0513d4d6910afe5e9f8a8
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27.7 b/metadata/md5-cache/sci-electronics/klayout-0.27.7
index f70caeee5bbc..577a8d2fec73 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27.7
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27.7
@@ -1,16 +1,16 @@
 BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=7
 HOMEPAGE=https://www.klayout.de/
 INHERIT=toolchain-funcs python-single-r1 ruby-ng
-IUSE=python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby27
-KEYWORDS=~amd64 ~x86
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ruby_targets_ruby27
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby27 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=eda4d5d2b589862f9a54b438d3675122
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e72cc627d0164c57381b3e14d4330d2b
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index e6baa4c57100..6b4f380bee86 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -1,15 +1,15 @@
 BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=7
 HOMEPAGE=https://www.klayout.de/
 INHERIT=toolchain-funcs python-single-r1 ruby-ng git-r3
-IUSE=python_single_target_python3_8 python_single_target_python3_9 ruby_targets_ruby27
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ruby_targets_ruby27
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby27 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=20d4a7f3be6413a87537df5e5760cb99
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a8ef0bfee1e0513d4d6910afe5e9f8a8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 47fa35dee518..1745b1abb8b0 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/gdal-3.5.1 b/metadata/md5-cache/sci-libs/gdal-3.5.1
new file mode 100644
index 000000000000..6cda6618de22
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gdal-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig:0 >=virtual/jdk-1.8:* ) python? ( dev-lang/swig:0 python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
+EAPI=8
+HOMEPAGE=https://gdal.org/
+INHERIT=cmake java-pkg-opt-2 python-single-r1
+IUSE=armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD Info-ZIP MIT
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) spatialite? ( sqlite )
+RESTRICT=!test? ( test ) test
+SLOT=0/31
+SRC_URI=https://download.osgeo.org/gdal/3.5.1/gdal-3.5.1.tar.xz test? ( https://download.osgeo.org/gdal/3.5.1/gdalautotest-3.5.1.tar.gz -> gdalautotest-3.5.1.tar )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ea250741f6ae541e49cd7be57590c05c
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
index af97eae68a7e..d826bf015205 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_8 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8b48d35a5d23c55ede3cffa6eb98accd
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
index eae565562abd..abc54c2701e7 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_8 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f269e84d8b1f142d4142a19d57300f3e
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index 77d9e36b15fb..8f745d3324c0 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -12,5 +12,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=d
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( cxx || ( ruby_targets_ruby26 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=55288dbc8bc8d527ce4964413ac4a2c9
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
deleted file mode 100644
index aa9f90389a6d..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
-EAPI=6
-HOMEPAGE=https://linux-gpib.sourceforge.io/
-INHERIT=readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) firmware? ( sys-apps/fxload ) acct-group/gpib ~sci-libs/linux-gpib-modules-4.3.4
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=437a98abe4f3499cec140d4b161656ba
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1 b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
index aa16ac03489d..7b2f741cde1b 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://linux-gpib.sourceforge.io/
 INHERIT=readme.gentoo-r1 autotools perl-functions python-single-r1 udev
 IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ) firmware? ( sys-apps/fxload ) acct-group/gpib ~sci-libs/linux-gpib-modules-4.3.4
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2008-08-10.tar.gz )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=cb16fa65dfbdf3af46f554b6c7d0ffc2
+_md5_=789145d87727f3fb3e5d29d3b65de991
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.7.1 b/metadata/md5-cache/sci-libs/nlopt-2.7.1
index b797cbe387e5..34c3341208e8 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.7.1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.7.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/stevengj/nlopt
 INHERIT=python-r1 cmake fortran-2
 IUSE=cxx guile octave python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( >=sci-mathematics/octave-6 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stevengj/nlopt/archive/v2.7.1.tar.gz -> nlopt-2.7.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1aa8911d2baf22b96799364deb1b47d3
+_md5_=fb70003c7dba8af9d2f7b7ac97137970
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.0.2 b/metadata/md5-cache/sci-libs/rocBLAS-5.0.2-r1
similarity index 81%
rename from metadata/md5-cache/sci-libs/rocBLAS-5.0.2
rename to metadata/md5-cache/sci-libs/rocBLAS-5.0.2-r1
index a37e5d31043a..d77978403bb8 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.0.2
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.0.2-r1
@@ -1,10 +1,10 @@
-BDEPEND=dev-util/rocm-cmake:0/5.0 dev-util/Tensile:0/5.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
+BDEPEND=dev-util/rocm-cmake:0/5.0 >=dev-util/Tensile-5.0.2-r1:0/5.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-util/hip:0/5.0 dev-libs/msgpack test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
-INHERIT=cmake docs prefix
+INHERIT=cmake docs multiprocessing prefix
 IUSE=benchmark test doc
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.0.2.tar.gz -> rocm-rocBLAS-5.0.2.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d82b8f150d8c460d558c1346ba555177
+_md5_=5fce0f8a288cac23cfe77a541b278542
diff --git a/metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1 b/metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
index 357e85aaaf41..736658a9b69a 100644
--- a/metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
+++ b/metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 >=dev-util/cmake-3.22 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=dev-util/hip:0/4.3 || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=Next generation FFT implementation for ROCm
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.3
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-4.3.0.tar.gz -> rocFFT-4.3.0.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=78894c043facf726ef011f6569b7cd1b
+_md5_=1b7f612d807c34f2c501e5fa7dae9117
diff --git a/metadata/md5-cache/sci-libs/rocFFT-5.0.2 b/metadata/md5-cache/sci-libs/rocFFT-5.0.2
index c02825d5e2db..6f1754057c2c 100644
--- a/metadata/md5-cache/sci-libs/rocFFT-5.0.2
+++ b/metadata/md5-cache/sci-libs/rocFFT-5.0.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 >=dev-util/cmake-3.22 dev-util/rocm-cmake:0/5.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 >=dev-util/rocm-cmake-5.0.2-r1:0/5.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=dev-util/hip:0/5.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 DESCRIPTION=Next generation FFT implementation for ROCm
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-5.0.2.tar.gz -> rocFFT-5.0.2.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=15f7f314c800333b7872a7e815b2c4e6
+_md5_=38908305d808499c12076b0c80225907
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e812ebb5be7b..fd880934e8ec 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.64 b/metadata/md5-cache/sys-apps/hdparm-9.64
new file mode 100644
index 000000000000..65778cef8137
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hdparm-9.64
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Utility to change hard drive performance parameters
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/hdparm/
+INHERIT=toolchain-funcs flag-o-matic
+IUSE=static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hdparm/hdparm-9.64.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=78d90b7b7acde0587b5950db403348ef
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.8.0 b/metadata/md5-cache/sys-apps/hwloc-2.8.0
new file mode 100644
index 000000000000..58d8a6ccb6ce
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwloc-2.8.0
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/ncurses-5.9-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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=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(-)?] ) udev? ( virtual/libudev:= ) xml? ( >=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(-)?] ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[static-libs] x11-libs/libXext x11-libs/libX11 )
+DESCRIPTION=Displays the hardware topology in convenient formats
+EAPI=8
+HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
+INHERIT=autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+IUSE=cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.9-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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.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(-)?] >=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(-)?] ) udev? ( virtual/libudev:= ) xml? ( >=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(-)?] ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[static-libs] x11-libs/libXext x11-libs/libX11 )
+SLOT=0/15
+SRC_URI=https://www.open-mpi.org/software/hwloc/v2.8/downloads/hwloc-2.8.0.tar.bz2
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cuda	15edbf8fd9df209322f42c06ecf59a96	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7fca1752e0fa68ee9f2f11d78380b7c3
diff --git a/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1 b/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
deleted file mode 100644
index 799840b311cd..000000000000
--- a/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Helper scripts useful for both OpenRC and systemd
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/init-system-helpers
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD GPL-2+
-RDEPEND=!<sys-apps/openrc-0.33
-SLOT=0
-SRC_URI=http://http.debian.net/debian/pool/main/i/init-system-helpers/init-system-helpers_1.49.tar.xz
-_md5_=e0640fba15061ad10107cd67c5b2c59d
diff --git a/metadata/md5-cache/sys-apps/onerng-3.6-r4 b/metadata/md5-cache/sys-apps/onerng-3.6-r4
deleted file mode 100644
index d54ef4c0186a..000000000000
--- a/metadata/md5-cache/sys-apps/onerng-3.6-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=postinst postrm setup
-DEPEND=virtual/udev
-DESCRIPTION=Software for the Open Hardware Random Number Generator called OneRNG
-EAPI=8
-HOMEPAGE=https://www.onerng.info/
-INHERIT=python-single-r1 udev
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=virtual/udev python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-crypt/gnupg python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-gnupg[python_targets_python3_10(-)] ) sys-apps/rng-tools sys-process/at
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.6.orig.tar.gz -> onerng-3.6.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=c013592dbac9b35066eb4d8877757b6a
diff --git a/metadata/md5-cache/sys-apps/onerng-3.7 b/metadata/md5-cache/sys-apps/onerng-3.7
index 0d68eca3f433..371f045b3278 100644
--- a/metadata/md5-cache/sys-apps/onerng-3.7
+++ b/metadata/md5-cache/sys-apps/onerng-3.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.onerng.info/
 INHERIT=python-single-r1 udev
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=virtual/udev python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) app-crypt/gnupg python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-gnupg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-gnupg[python_targets_python3_11(-)] ) sys-apps/rng-tools sys-process/at
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.7.orig.tar.gz -> onerng-3.7.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=e59bc011a1ca47e4c2920c05280045ac
+_md5_=f5bac82d15cfd017a6f6e97c4cc21476
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1 b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
deleted file mode 100644
index 01aba7c49258..000000000000
--- a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
-DESCRIPTION=Service manager for the s6 supervision suite
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/s6-rc/
-INHERIT=toolchain-funcs
-IUSE=static static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
-REQUIRED_USE=static? ( static-libs )
-SLOT=0/0.5
-SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.3.0.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=cd165b198a9b80a22495f8657bf1ba1a
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 77776dc0d167..5331c5286d58 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28-r2 b/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
index 8e7c60570ce6..45a93677c1ac 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://galeracluster.com
 INHERIT=python-any-r1 scons-utils toolchain-funcs flag-o-matic
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=94a7a86170b610822c2101b4cceea8f0
+_md5_=8f0463388d0d10aebd6ac73b105fde9a
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.8.0 b/metadata/md5-cache/sys-cluster/hpx-1.8.0
index 962352ff8877..5bfb22d3d1df 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.8.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.8.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.8.0.tar.gz -> hpx-1.8.0.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=66f5c7279af05f123f00e8a6055ae37b
+_md5_=5d883799c3c4ef23efca9d1d27f9d901
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104
index c92c91fb1d51..55df9b13730f 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=943231efa73ef755ac65bd97d29a28f7
+_md5_=95e7cf4b9f9060849ba630fe5b093273
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105
index 0389b600f885..a41a745365db 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=898f73243f34643b28f54f45cc4d50e4
+_md5_=4ea6f5a61a04627684dba19a5f6048c9
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 100adb1a7ba3..c2b09a377441 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.37_p1-r3 b/metadata/md5-cache/sys-devel/binutils-2.37_p1-r3
deleted file mode 100644
index 36941581c92f..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.37_p1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.37
-SRC_URI=mirror://gnu/binutils/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1-patches-2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9f289f3dd6028bfa5337ce4459f8bffa
diff --git a/metadata/md5-cache/sys-devel/binutils-2.38-r3 b/metadata/md5-cache/sys-devel/binutils-2.38-r3
deleted file mode 100644
index 601535297e13..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.38-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.38
-SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=24312031fd44696872a729258534b674
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 89f836f8cc83..30932ab73390 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6e4fc5315b4bcff5c6277cb284df71ee
+_md5_=d42009470b0c2e98816962eef83c6f0b
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220709 b/metadata/md5-cache/sys-devel/crossdev-20220709
new file mode 100644
index 000000000000..680737a2890e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20220709
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=install
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220709.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220709.tar.xz
+_md5_=ad3af1e70cb72b1b49e66da4c58cd91f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707
new file mode 100644
index 000000000000..33ea2843d13f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220707/gcc-10-20220707.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708
new file mode 100644
index 000000000000..c599a47aa2b8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220708/gcc-11-20220708.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709
new file mode 100644
index 000000000000..e89d4bece451
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220709/gcc-12-20220709.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0d7a92302649bc2c9b79b7eef60af7b2
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 67ad50eb5f1c..6371d4cd5b73 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
index 8abb2b9c04d9..9c95b6ca2ba0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.286
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-297.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-297.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-297.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d2263a2a28ea7c9107753b0bfca1473b
+_md5_=49fcdb46f513d4dbf5f20e40ac95b5ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
index 36a24281a685..ecc2cf3ef3fe 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.250
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-249.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-249.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-249.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=b0e70cb6d4eb970fc943bc87eb47f8ed
+_md5_=4d97b0e38175ed328fb989fb47ccb4c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
index cc507560c79b..60233a81585c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.321
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=eee8d7d91f2970552916b9df63d3bcdb
+_md5_=de3dfec05b336cd2e31fccddb2976fb0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128
index 3b0a5ec24b57..226bdeeecb87 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.128
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-137.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-137.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-137.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-137.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-137.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-137.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-137.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-137.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-137.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d953e27110bb124e6085ede85f44fb10
+_md5_=04847478129a08fd32f7053fd84351f2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52
index 65a5684a8def..85428cb0fdd5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.52
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-56.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-56.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-56.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-56.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-56.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-56.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-56.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-56.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-56.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2e5d485b13bd859723c7a7d67cc73d07
+_md5_=f9dc1453f1ae6f4782549e5d846473c5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
index d94a4c4a63fc..b692ac9699b9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.203
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-208.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-208.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-208.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=ae3f23666f570824d4fdfffaff0331f6
+_md5_=c6f6d4c32ba08bee12337905297a2a7c
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.15.33 b/metadata/md5-cache/sys-kernel/linux-docs-5.15.53
similarity index 71%
rename from metadata/md5-cache/sys-kernel/linux-docs-5.15.33
rename to metadata/md5-cache/sys-kernel/linux-docs-5.15.53
index ac51decadf79..4d79be336af0 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-5.15.33
+++ b/metadata/md5-cache/sys-kernel/linux-docs-5.15.53
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) dev-python/sphinx dev-python/sphinx_rtd_theme media-libs/fontconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) dev-python/sphinx dev-python/sphinx_rtd_theme media-libs/fontconfig
 DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=Developer documentation generated from the Linux kernel
 EAPI=8
@@ -7,8 +7,8 @@ INHERIT=linux-info python-any-r1 toolchain-funcs
 IUSE=graphviz
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=graphviz? ( media-gfx/graphviz )
+RDEPEND=graphviz? ( >=media-gfx/graphviz-5.0.0 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6f57750f725afdeb93217ba6a6bcab29
+_md5_=1903c265f8c8cf777a9b8057c2949a13
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210629 b/metadata/md5-cache/sys-kernel/linux-firmware-20220708
similarity index 81%
rename from metadata/md5-cache/sys-kernel/linux-firmware-20210629
rename to metadata/md5-cache/sys-kernel/linux-firmware-20220708
index 88fca86726f1..221a027742b3 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210629
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20220708
@@ -3,13 +3,14 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
 DESCRIPTION=Linux firmware files
 EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=mount-boot savedconfig
 IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/d79c26779d459063b8052b7fe0a48bce4e08d0d9.tar.gz -> linux-firmware-20210629.tar.gz
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20220708.tar.xz
 _eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d
-_md5_=78a08008d25061b6a8ece790a52a1ef8
+_md5_=704fbd06a4b0bdbbecf5fe726e4646a7
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 81573e8695cc..1a0c6f188156 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2-r1
similarity index 93%
rename from metadata/md5-cache/virtual/libelf-2
rename to metadata/md5-cache/virtual/libelf-2-r1
index 89963715e7b3..9a103c5ddcef 100644
--- a/metadata/md5-cache/virtual/libelf-2
+++ b/metadata/md5-cache/virtual/libelf-2-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.0 provider dev-libs/libelf
-EAPI=6
+EAPI=8
 INHERIT=multilib-build
 IUSE=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 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libelf-0.8.13-r2: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(-)?]
 SLOT=0/0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c55bf46a6dcb584ec070b588c5bfe99e
+_md5_=3359eb61dc7070c05cb923d32407e8b2
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3-r1
similarity index 93%
rename from metadata/md5-cache/virtual/libelf-3
rename to metadata/md5-cache/virtual/libelf-3-r1
index 8f29ba317c66..aa9949c410c7 100644
--- a/metadata/md5-cache/virtual/libelf-3
+++ b/metadata/md5-cache/virtual/libelf-3-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.1 provider dev-libs/elfutils
-EAPI=7
+EAPI=8
 INHERIT=multilib-build
 IUSE=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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=>=dev-libs/elfutils-0.155-r1: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(-)?]
 SLOT=0/1
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d9b48b64e232269d98a7c4282a461788
+_md5_=8398ecb5307568aa39e921ff0c1d2724
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index 8ef3ebef32af..97e8823557a3 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf45767ae2ccb6266c245d17d58a49c4
diff --git a/metadata/md5-cache/virtual/ruby-ssl-12 b/metadata/md5-cache/virtual/ruby-ssl-12
index efb2346c9dba..3637bf470776 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-12
+++ b/metadata/md5-cache/virtual/ruby-ssl-12
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1[ssl] ) 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_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f8911cf1e168b0d5f33ae04928033ef7
diff --git a/metadata/md5-cache/virtual/rubygems-15 b/metadata/md5-cache/virtual/rubygems-15
index 85c3ea26247e..adb01df699bb 100644
--- a/metadata/md5-cache/virtual/rubygems-15
+++ b/metadata/md5-cache/virtual/rubygems-15
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0251450a29a6f9d235acfc90264c13be
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index 982555c68201..9b7cf8cf2b50 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3725ad6a7ccad9f8099243ea6b6212e7
diff --git a/metadata/md5-cache/virtual/rubygems-17 b/metadata/md5-cache/virtual/rubygems-17
index 6c46d20e9a95..73280bb08bf2 100644
--- a/metadata/md5-cache/virtual/rubygems-17
+++ b/metadata/md5-cache/virtual/rubygems-17
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby31? ( >=dev-ruby/rubygems-3.3.0[ruby_targets_ruby31] ) 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_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b9374279d2016f3f2aa9668dcd539341
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4d963235c97c..806cb4c3fa1b 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.11 b/metadata/md5-cache/www-apache/passenger-6.0.11
index 791ec76a36a1..18e4c06ef9e6 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.11
+++ b/metadata/md5-cache/www-apache/passenger-6.0.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.11.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=109cc5ca8ced3c58e8136795f60674f5
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.14 b/metadata/md5-cache/www-apache/passenger-6.0.14
index 709a15d9a850..bad1fa25f577 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.14
+++ b/metadata/md5-cache/www-apache/passenger-6.0.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.14.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7f291c34d23053b72e71c0b6cc62660c
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e4dddbeaaba5..694752d12650 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/element-1.11.0 b/metadata/md5-cache/www-apps/element-1.11.0
new file mode 100644
index 000000000000..296f0817be4a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=8
+HOMEPAGE=https://element.io/
+INHERIT=webapp
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-admin/webapp-config
+SLOT=1.11.0
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.11.0/element-v1.11.0.tar.gz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=c78809ecdea24af42e1a2503a5b9ed86
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.2 b/metadata/md5-cache/www-apps/jekyll-4.2.2
index 4a6d00aa4b9a..f3a0c0d5821f 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.2
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.2.tar.gz -> jekyll-4.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0e468e382e0e8f411714c3d2ade0bbad
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0 b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
index aa33456fd83e..f7e7a8ee6961 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v2.0.0.tar.gz -> jekyll-coffeescript-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8014bad6313a9695001cc45544cfe085
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
index 2c22e3a8e1a7..9093552005ec 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v2.2.0.tar.gz -> jekyll-sass-converter-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7ae74a7164aa5501b4b9b5c251957f74
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
index b2c586f91940..44d24e514539 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v1.4.0.tar.gz -> jekyll-sitemap-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=43b748dd850cb3613d8f8289bdd099e3
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1 b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
index fcb7849f3ce5..fec1bb9b482d 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v2.2.1.tar.gz -> jekyll-watch-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d90149d385e3f9535ef494b96ea01ab0
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.37.4 b/metadata/md5-cache/www-apps/mediawiki-1.37.4
new file mode 100644
index 000000000000..e9051693f467
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.37.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=8
+HOMEPAGE=http://www.mediawiki.org
+INHERIT=webapp
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.37.4
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.37/mediawiki-1.37.4.tar.gz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=a51c1902f493d517b0a81998891fda77
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.2 b/metadata/md5-cache/www-apps/nanoc-4.12.2
index fc1ad79277d1..8f2ed2dee863 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dedad9787f298166afdde6668e19f045
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.3 b/metadata/md5-cache/www-apps/nanoc-4.12.3
index d0150682f2d4..26b8bae90d5a 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.3
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.3.tar.gz -> nanoc-4.12.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b30df7c302544350de2cfd5ecaabe9bc
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.5 b/metadata/md5-cache/www-apps/nanoc-4.12.5
index b5aa12d444fb..2ff2eae54e4e 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.5
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.5.tar.gz -> nanoc-4.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0f9a61a1a65a0e65164ae7bb57893dae
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.6 b/metadata/md5-cache/www-apps/nanoc-4.12.6
index b0d0f0e37701..bcfc6bebef16 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=182f7e48779d4ef64f2f31ce5575b2ec
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.7 b/metadata/md5-cache/www-apps/nanoc-4.12.7
new file mode 100644
index 000000000000..f1fb420ed231
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/asciidoctor[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/haml[ruby_targets_ruby27(-)] dev-ruby/maruku[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/mustache[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby27(-)] dev-ruby/rubypants[ruby_targets_ruby27(-)] dev-ruby/systemu[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/vcr[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby27(-)] dev-ruby/rdiscount[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/asciidoctor[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/haml[ruby_targets_ruby30(-)] dev-ruby/maruku[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/mustache[ruby_targets_ruby30(-)] dev-ruby/pry[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby30(-)] dev-ruby/rubypants[ruby_targets_ruby30(-)] dev-ruby/systemu[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby30(-)] dev-ruby/rdiscount[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=26a7ab651d65bb88a50538ffa23ece0c
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
index f855b968b3a2..d1c8d614a0a8 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=12fd155b7b08150790cf920f2f242028
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
index e30c8d5b54c6..2a2161e1c6b1 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d16cb38469bad08fe6cd2e5d7b8d4f10
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
index 087c9022ae02..4c017771e1b6 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7a971ab8c8ab2e0f6b1fa676f3422f5b
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.3 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.3
index 50347edd0e87..fb5960fd0664 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.3
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.3.tar.gz -> nanoc-4.12.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=08fa0efe3966d3408335ce34987535d5
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.5 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.5
index b5e52c60492e..4e75cd8e2fb7 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.5
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.5.tar.gz -> nanoc-4.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=08fa0efe3966d3408335ce34987535d5
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.6 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
index 1197c5557fa6..7c58664e51f7 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d10b223a477d124a09ae76339a9ea65d
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.7 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
new file mode 100644
index 000000000000..cedb7e4911db
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a085fc69d60885d53c151f7710f7fa6b
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.2 b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
index 8aebdd2ac8f6..c79a4dd73c3c 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-core-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d2279824a1c7c62af1df1192c60d5e37
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.3 b/metadata/md5-cache/www-apps/nanoc-core-4.12.3
index 55372007f946..b4fa345d5879 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.3
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.3.tar.gz -> nanoc-core-4.12.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d261cfe998253f16c662c521a6e4286a
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.5 b/metadata/md5-cache/www-apps/nanoc-core-4.12.5
index 0338ec676104..08e9f0e1dfdc 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.5
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.5.tar.gz -> nanoc-core-4.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fc23effc971b7663f90b5bd338077616
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.6 b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
index 21f5458fe587..c1eb5cb17dfb 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-core-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=35edfea82478093d086b9e2024d7c7c2
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.7 b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
new file mode 100644
index 000000000000..4084ffe1d9fd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/psych:0[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/psych:0[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/psych:0[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/psych:0[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-core-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3dfbb73f34a8ef4a7f758d435d11b953
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
index 2af9c3b278f9..97cd59f9b4a7 100644
--- a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bbf7a79ced46985cb005fd9d46cf0849
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
index 8e0c7b3f8260..635a10ad743d 100644
--- a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49b9a301354f22ccf9ea0e891946a67b
diff --git a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2 b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
index 3b2aa46e7c1a..444337b30c41 100644
--- a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanoc-spec-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=66a301fdbb20f7b82396777a3d46361f
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.5 b/metadata/md5-cache/www-apps/redmine-4.1.5
index 3d5118ef6143..c197ad82881a 100644
--- a/metadata/md5-cache/www-apps/redmine-4.1.5
+++ b/metadata/md5-cache/www-apps/redmine-4.1.5
@@ -12,5 +12,5 @@ RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby26? ( dev-lang/rub
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-4.1.5.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ae135468e865595c97590eaabdc31b63
diff --git a/metadata/md5-cache/www-apps/redmine-4.2.3 b/metadata/md5-cache/www-apps/redmine-4.2.3
index 7e5470525110..dc59b8686b57 100644
--- a/metadata/md5-cache/www-apps/redmine-4.2.3
+++ b/metadata/md5-cache/www-apps/redmine-4.2.3
@@ -12,5 +12,5 @@ RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagic
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-4.2.3.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3ffe84e28e18efcecf3e4234f0080438
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 7ced4a28b7c5..d65673a3419d 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/epiphany-42.3 b/metadata/md5-cache/www-client/epiphany-42.3
new file mode 100644
index 000000000000..8813ec34fb4a
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-42.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.33.2:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.5.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0=
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+INHERIT=gnome.org gnome2-utils meson xdg virtualx
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.33.2:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.5.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/42/epiphany-42.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=915f8bdb5d3b77af7499986a3ba7500a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 42a6cb569c25..cf38ca1d505d 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.6-r1 b/metadata/md5-cache/www-servers/adsf-1.4.6-r1
index 7827e37e33f2..eabb455813fd 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.6-r1
+++ b/metadata/md5-cache/www-servers/adsf-1.4.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.6.tar.gz -> adsf-1.4.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2256ec29195e6352d6e7ed311bfe37f2
diff --git a/metadata/md5-cache/www-servers/apache-2.4.53 b/metadata/md5-cache/www-servers/apache-2.4.53
deleted file mode 100644
index ae4fd9eb7f14..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.53
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
-DESCRIPTION=The Apache Web Server
-EAPI=7
-HOMEPAGE=https://httpd.apache.org/
-INHERIT=apache-2 systemd tmpfiles toolchain-funcs
-IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.53
-RDEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
-REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.53.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	7f8f655013bcf05aba273b10f94032bc	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e0be57b488c1803ce255ca66b1744f8f
diff --git a/metadata/md5-cache/www-servers/apache-2.4.53-r1 b/metadata/md5-cache/www-servers/apache-2.4.53-r1
deleted file mode 100644
index 679b2c096490..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.53-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
-DESCRIPTION=The Apache Web Server
-EAPI=7
-HOMEPAGE=https://httpd.apache.org/
-INHERIT=apache-2 systemd tmpfiles toolchain-funcs
-IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.53
-RDEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
-REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.53.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	7f8f655013bcf05aba273b10f94032bc	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe1c371c2eaca89ea92c83ec5094b605
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54 b/metadata/md5-cache/www-servers/apache-2.4.54-r2
similarity index 76%
rename from metadata/md5-cache/www-servers/apache-2.4.54
rename to metadata/md5-cache/www-servers/apache-2.4.54-r2
index 1e8f27d037ab..bf5d6ff87596 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54
+++ b/metadata/md5-cache/www-servers/apache-2.4.54-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
 DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
@@ -9,9 +9,9 @@ IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.54
-RDEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
 REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	7f8f655013bcf05aba273b10f94032bc	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d33da540dd8361a4f45ecc9f630a7c27
+_eclasses_=apache-2	d3ca80efce0c66610ad3fbeca0a20b3f	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=83e81303608646fe4f4e445fecab9d22
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54-r1 b/metadata/md5-cache/www-servers/apache-2.4.54-r3
similarity index 76%
rename from metadata/md5-cache/www-servers/apache-2.4.54-r1
rename to metadata/md5-cache/www-servers/apache-2.4.54-r3
index 3de1ae783f86..114f9e04d209 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.54-r3
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
 DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
@@ -9,9 +9,9 @@ IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.54
-RDEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
 REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	7f8f655013bcf05aba273b10f94032bc	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8944cbedcf7d2d206db106b9742d2620
+_eclasses_=apache-2	d3ca80efce0c66610ad3fbeca0a20b3f	autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=91b12451e644d1f65350ea0cd87768ca
diff --git a/metadata/md5-cache/www-servers/nginx-1.20.1-r3 b/metadata/md5-cache/www-servers/nginx-1.20.1-r3
deleted file mode 100644
index 07594ff11148..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.20.1-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.20.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4ce55e9c64d03aee384f60489bbe8865
diff --git a/metadata/md5-cache/www-servers/nginx-1.20.2-r1 b/metadata/md5-cache/www-servers/nginx-1.20.2-r1
deleted file mode 100644
index 376108f8890e..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.20.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.20.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f0823316f36bfa0999d3fe6ae0f5ae49
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.0-r3 b/metadata/md5-cache/www-servers/nginx-1.21.0-r3
deleted file mode 100644
index 37b548e7f207..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.21.0-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.21.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=59d6e4612a0e942932498bc5809ec659
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.1-r1 b/metadata/md5-cache/www-servers/nginx-1.21.1-r1
deleted file mode 100644
index 37d51b2814b0..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.21.1-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.21.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=535f98f5af0be71b5d5bbbcfe3626626
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.2-r1 b/metadata/md5-cache/www-servers/nginx-1.21.2-r1
deleted file mode 100644
index 7cc4d1fe54b3..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.21.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.21.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a923a1a86dd3e94d33c82e50d9737778
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.3-r1 b/metadata/md5-cache/www-servers/nginx-1.21.3-r1
deleted file mode 100644
index aec70fcbcf9d..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.21.3-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.21.3.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a923a1a86dd3e94d33c82e50d9737778
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.4-r1 b/metadata/md5-cache/www-servers/nginx-1.21.4-r1
deleted file mode 100644
index c81ddd849d70..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.21.4-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=7
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.21.4.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.2.tar.gz -> njs-0.6.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a923a1a86dd3e94d33c82e50d9737778
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.6-r1 b/metadata/md5-cache/www-servers/nginx-1.21.6-r2
similarity index 67%
rename from metadata/md5-cache/www-servers/nginx-1.21.6-r1
rename to metadata/md5-cache/www-servers/nginx-1.21.6-r2
index f850b657afc4..346c1302c1f2 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.6-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.21.6-r2
@@ -1,18 +1,18 @@
 BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
+DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
 DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=7
 HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
+INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.2.tar.gz -> njs-0.7.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.2.tar.gz -> njs-0.7.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5263cd7cb40e6ef436a017320ddd352c
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=9285d361f48552b63aa764e53e24dad9
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.27.0 b/metadata/md5-cache/www-servers/nginx-unit-1.27.0
new file mode 100644
index 000000000000..28cb024e2d08
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.27.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DESCRIPTION=Dynamic web and application server
+EAPI=8
+HOMEPAGE=https://unit.nginx.org
+INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
+IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.27.0.tar.gz -> nginx-unit-1.27.0.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e38151ed30b394bc44820ebf78398497
diff --git a/metadata/md5-cache/www-servers/puma-5.6.4 b/metadata/md5-cache/www-servers/puma-5.6.4
index 074553fcb5f7..02952ef797c7 100644
--- a/metadata/md5-cache/www-servers/puma-5.6.4
+++ b/metadata/md5-cache/www-servers/puma-5.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ru
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.6.4.tar.gz -> puma-5.6.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3b122c2ae98fe936c2fa259afc59a85e
diff --git a/metadata/md5-cache/www-servers/thin-1.8.1 b/metadata/md5-cache/www-servers/thin-1.8.1
index 24a8b6db0504..e9cb40287ad1 100644
--- a/metadata/md5-cache/www-servers/thin-1.8.1
+++ b/metadata/md5-cache/www-servers/thin-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.8.1.tar.gz -> thin-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=782c59f9bd200d700bba09d21cec9e63
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.22 b/metadata/md5-cache/www-servers/tomcat-10.0.22
index a0cde9598aa1..c15e0a50c82e 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.0.22
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.22
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~amd64-linux
+KEYWORDS=amd64 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.22:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=10
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.22/src/apache-tomcat-10.0.22-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6c0b034a8a7ac21052ec8d535344acd6
+_md5_=b24ff14ee46257c4632ef9a322fd7e9d
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.81 b/metadata/md5-cache/www-servers/tomcat-8.5.81
index 6cd1146973fa..10c70ddea41f 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.81
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.81
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.81:3.1 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6fecbc278fa842e188fa386a6ef59362
+_md5_=a349f6c83e999bc4dc1e10e73c82d933
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.64 b/metadata/md5-cache/www-servers/tomcat-9.0.64
index 04c5b1b19615..307455be83b8 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.64
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.64
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.64:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.64/src/apache-tomcat-9.0.64-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=fafc247f2998ffbc741126e488bb3f84
+_md5_=9011e000813038b08b10f89c4ceccac9
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
index 3108c44a87e2..1104fe67af81 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python-asyncio? ( python ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=268606ac3613ce637a5a208ea8558cf2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 6f3d209e8c8d..2dac6747b7c7 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.112 b/metadata/md5-cache/x11-libs/libdrm-2.4.112
new file mode 100644
index 000000000000..c31bc4b97094
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.112
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta3:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta3:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=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(-)?] ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=X.Org libdrm library
+EAPI=7
+HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
+INHERIT=python-any-r1 meson-multilib
+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 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 ~loong ~m68k ~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.112.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2cc95670908abda0d67e9e16a6b4341e	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2fabe0d3c5013566db5262ff33bd33fe
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
deleted file mode 100644
index 2d757ee56501..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[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? ( >=dev-libs/glib-2.22: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/libpng: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(-)?] sys-libs/zlib[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/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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[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/libSM[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[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) ) virtual/pkgconfig opengl? ( virtual/glu[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-base/xorg-proto )
-DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
-EAPI=6
-HOMEPAGE=https://wxwidgets.org/
-INHERIT=multilib-minimal
-IUSE=+X doc debug gstreamer libnotify opengl sdl tiff 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 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
-PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
-RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[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? ( >=dev-libs/glib-2.22: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/libpng: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(-)?] sys-libs/zlib[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/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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[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/libSM[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[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) )
-SLOT=3.0
-SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=abcf01582e7f2f29ac777553ad1d3931
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r3 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r3
new file mode 100644
index 000000000000..b1e0975b26ba
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[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? ( dev-libs/glib: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/libjpeg-turbo:=[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/libpng:=[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[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/gtk+: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[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/libSM[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[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) ) opengl? ( virtual/glu[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-base/xorg-proto )
+DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
+EAPI=8
+HOMEPAGE=https://wxwidgets.org/
+INHERIT=multilib-minimal
+IUSE=+X doc debug gstreamer libnotify opengl sdl tiff 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 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
+PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
+RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[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? ( dev-libs/glib: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/libjpeg-turbo:=[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/libpng:=[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[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/gtk+: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[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/libSM[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[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) )
+SLOT=3.0
+SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3a45607bb4f4034f8f1b889a20cb2818
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.5.1 b/metadata/md5-cache/x11-libs/wxGTK-3.0.5.1
index c83f74f89d7d..dcce3dd434b4 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.5.1
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.5.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wxwidgets.org/
 INHERIT=multilib-minimal
 IUSE=+X doc debug gstreamer libnotify opengl sdl tiff webkit 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 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 RDEPEND=>=app-eselect/eselect-wxwidgets-20131230 dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[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? ( >=dev-libs/glib-2.22: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/libpng: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(-)?] sys-libs/zlib[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/jpeg: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(-)?] x11-libs/cairo[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/gtk+: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/gdk-pixbuf[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/libSM[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[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[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webkit? ( net-libs/webkit-gtk:4 ) )
 SLOT=3.0-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5.1/wxWidgets-3.0.5.1.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.5_p20210214.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxWidgets-3.0.5-docs-html.tar.bz2 )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c6ffbf2c813af8d34ea07bac994a2e95
+_md5_=259c85720ebf80071a7a8cd94b367aff
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a3eab4dfd736..fc5426bffdc3 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
index 9714ccd99dd3..c14fc9dc6c58 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
@@ -1,10 +1,10 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
 EAPI=7
 HOMEPAGE=https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee
-INHERIT=autotools readme.gentoo-r1 systemd
+INHERIT=autotools readme.gentoo-r1 systemd udev
 IUSE=+bbswitch video_cards_nouveau video_cards_nvidia
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 acct-group
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz -> bumblebee-3.2.1_p20210112.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2d1a1efe28e0b5c78d2196810a9a1b04
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=efcd89307a7dc65499330101aaf509af
diff --git a/metadata/md5-cache/x11-misc/bumblebee-9999 b/metadata/md5-cache/x11-misc/bumblebee-9999
index 5216ecd14b11..ee4e52ce96f6 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-9999
+++ b/metadata/md5-cache/x11-misc/bumblebee-9999
@@ -1,10 +1,10 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
 EAPI=7
 HOMEPAGE=https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee
-INHERIT=autotools readme.gentoo-r1 systemd git-r3
+INHERIT=autotools readme.gentoo-r1 systemd udev git-r3
 IUSE=+bbswitch video_cards_nouveau video_cards_nvidia
 LICENSE=GPL-3
 PDEPEND=|| ( x11-misc/primus x11-misc/virtualgl )
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 acct-group/bumblebee virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=707fffefbc12e409b4fc3a59399b166d
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=8886c8bbcbbd15fdf8a3c7fda6f8897b
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index bf56e52a818a..44116ccecd1e 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
index 2093459388d8..c8f904bd23cf 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=app-admin/gkrellm:2[X]
 DESCRIPTION=A simple countdown clock for GKrellM2
@@ -11,4 +11,4 @@ RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6e86585ad517024059b1f33767247df5
+_md5_=90f4af82cd0df29f8c7a5a4e97c73b27
diff --git a/metadata/md5-cache/x11-plugins/wmbio-1.02 b/metadata/md5-cache/x11-plugins/wmbio-1.02
index 078d7d0eb4ff..b1927f4ea579 100644
--- a/metadata/md5-cache/x11-plugins/wmbio-1.02
+++ b/metadata/md5-cache/x11-plugins/wmbio-1.02
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=A Window Maker applet that shows your biorhythm
 EAPI=6
 HOMEPAGE=http://wmbio.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmbio/wmbio-1.02.tar.gz
-_md5_=08c5f066433cfc5ec44b55a93bd7ffae
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=26d916e803c1c168b7e6657c7aa8aa0d
diff --git a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1 b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
index 9dea94b31e0c..c5be46f9fb53 100644
--- a/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmcdplay-1.1.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c10d583a83472a32aa68036ced34caad
+_md5_=785e4c3efa6262e8947f641b89eb35f1
diff --git a/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4 b/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
index 2603b95be08d..dc7e7f62d3d8 100644
--- a/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
+++ b/metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
@@ -3,8 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
 DESCRIPTION=WindowMaker CPU and Memory Usage Monitor Dock App
 EAPI=7
 HOMEPAGE=https://www.geocities.ws/neofpo/wmcms.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.geocities.ws/neofpo/files/wmcms-0.3.5.tar.gz
-_md5_=328769f515b3721634087a2176274f71
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d2d96d1d62c83cef2bebe34eefe902b1
diff --git a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3 b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
index c30ef9ab8563..2837aff2b518 100644
--- a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
+++ b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
@@ -3,9 +3,11 @@ DEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2 v
 DESCRIPTION=dockapp which provides a drawer (retractable button bar) to launch applications
 EAPI=6
 HOMEPAGE=http://people.easter-eggs.org/~valos/wmdrawer/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://people.easter-eggs.org/~valos/wmdrawer/wmdrawer-0.10.5.tar.gz
-_md5_=b6a9feca8037f748e7e7039c71206473
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a933170e42621b1d6868b0e7b3b7c473
diff --git a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2 b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
index 9b349e97bc0f..87f48f8d2d87 100644
--- a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
+++ b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
@@ -3,11 +3,11 @@ DEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x
 DESCRIPTION=wmGrabImage grabs an image from the WWW and displays it
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmgrabimage
-INHERIT=desktop
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmGrabImage-0.72.tgz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=2ba3724f0ef3626a0bcd9c14af86f170
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=59b792fb68a48e3cb2af30ae7a9fa5f8
diff --git a/metadata/md5-cache/x11-plugins/wmix-3.5 b/metadata/md5-cache/x11-plugins/wmix-3.5
index 90435e08be9a..90ad5ebbc6cb 100644
--- a/metadata/md5-cache/x11-plugins/wmix-3.5
+++ b/metadata/md5-cache/x11-plugins/wmix-3.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
 DEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr x11-base/xorg-proto
 DESCRIPTION=Dockapp mixer for OSS or ALSA
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmix-3.5.tar.gz
-_md5_=f310d9f22f8452ea3be19d346dbfbeed
+_md5_=3e11105fe2f93c8a65403dd24825a5dd
diff --git a/metadata/md5-cache/x11-plugins/wmpager-1.2-r2 b/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
index 84b956245912..2d90a0c703d8 100644
--- a/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmpager-1.2-r2
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 DESCRIPTION=A simple pager docklet for the WindowMaker window manager
 EAPI=7
 HOMEPAGE=http://wmpager.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~sparc x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/wmpager/wmpager-1.2.tar.gz
-_md5_=707a81a8e8fc352f78f1905ddc5b43e2
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6df6c3d25f3e7cca14fce76fbcd4711b
diff --git a/metadata/md5-cache/x11-plugins/wmrack-1.4-r1 b/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
index aef0e57b4dea..6a39a2e43551 100644
--- a/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
+++ b/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
@@ -3,11 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=a sound mixer and CD player dockapp
 EAPI=7
 HOMEPAGE=http://wmrack.sourceforge.net
-INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/wmrack/wmrack-1.4.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3d5d7c516175d873a4962937e0fb52d3
+_md5_=7ae7706c6f170151a0f49ecfaa8151c6
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index c7ddbf4ef602..cf0f0800ce5b 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1 b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
index 6660861e8ba5..16ba33b4d078 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49a1326fcd33328d94a226525b20afa0
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 60aa437329d8..d5fdd565da24 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/thunar-4.17.9 b/metadata/md5-cache/xfce-base/thunar-4.17.9
new file mode 100644
index 000000000000..79f01b836b68
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-4.17.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.6:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+INHERIT=xdg-utils
+IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.6:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.17/thunar-4.17.9.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=34483a6cde49a654f66247c4dadf3d51
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
new file mode 100644
index 000000000000..82aa85d9995b
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/
+INHERIT=vala xdg-utils
+IUSE=+dbusmenu introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.2.tar.bz2
+_eclasses_=vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bc79a8fe93c6e15d796d269054608f59
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b31c89a7e2dc..d7eeb4f8f9c8 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-08T11:39:43Z
+TIMESTAMP 2022-07-10T14:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLIF39fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLK5LNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBiWhAAkfdmwXTP0izlrR3538OW/W6oW8mJMJ8DhOizxc5hIvPzE+WIiw1X9uDw
-JGdL0o+2q8MKbrECXS4WwD5JBj8fADojhZSfrdd7BGSEEdLooC5aJmL3EkMpvUCv
-RZhc80TbIxZWXamzEF0jlehwyfwFs6Juxg6cnCxrSNvm/Ectu+5huu4/oQ8FdJz7
-ToT4BzmZ+7q06dWvLYgroboAj3IlfpDIVBs/0DR0SMQfhbBXYxVaoO2mwexag8dt
-mweLZKhuqyfzwv7PRjNRKcgtG3eYqn6U86OWMvuVOxhGdcmoAj+NCRGil94uB32j
-OxqUYb1EaMi6GGvUiCzpO+bii4ZF6NgPv/zjW2uZ8PxgEVJF0BmM3LalurD1eDsb
-YZWQIlPHQA+DDWlKcZo/q93jPqzBkoN0sgsUzWR5haynX1CM0xXDXdULqj4ISO0F
-SfA5bpEry+Q3RqdZsCljRw3D9TLim4fjxIwe2JY8kGnRKQ0QqdU/rUd96WPtZ5Ch
-r3UpWEMScQy8WLcHXYqTk3W4N+R7RvnsqWnI78gHlz+otrQq4niBVHGJz4nm9StT
-/g7sYO5tmSAGzjQP539JY3vfQtOEiHIeH3ZOcp0hzKuA5WPz1+IWWE5tFMT9FuLB
-NrWiJwQWEh/iDXPKV+Y5KpC1Mo8d2daQ2Q88Lp4T+A7owDRiV0k=
-=u4Rx
+klDAjhAAkyZm18w0DhPLfHVV/nWoesTfK1GA+56YzZeVG4tabH5qd38RjSyz4zoE
+G7YV4xQRHojEVGud0xLCwhq7PU8LB8fRpgmiYbn/NBzLZGpMeOMQEnbNVbfMqUBf
+G5+5rU8bF3FyWyrPvBV2fZw7S76AqT5PO5E/BZitiTnQnI6ygc1DGZaTI2nlQ9Eq
+Xl2JGFxvGkkdAqjz9+ra39U9G/Yjcai1K8236cymaDvaxR8+9AAh/r9mvZBVtXuI
+xbYgt0ffY7TQeRaO2ZY98cTFNpsxehc5fKiWqmtxPiZyEje5swz/oh6Q2qOns94t
+IRs0TL9KBS4+tD4EzLZvJfXkAsGAHQV/SXuGDNZcVRf76aD5TxN2D34q5e4Umygy
+lBmPv7PozfmmVDScLEYLHnjs/Q/AtmxRK1KOOLFJnCepIXDoKr54nUnxO73HFhLf
+IukNnJBTHTfGxVofj1m3DmrHujm1osGvOsNbvRhwv63/eOvxS/vWpewnh0zRU4aL
+FwwyUXjDPecG45gw8mkAJSGfsLoAN9fzzBCOcQJVEBy/PrQ8cxqChqAWpdW0hEd6
+7IrQQQ3GBd7UvmuthZcMokLt2G9Yl6MQbLlEt0vMzu4BKs1r5v5DKSZzJr8H31ap
+DSVOMIgZUuA4JCUeMXhUOGW9gsvGCfLN9IHp7d2LIqaj0IUiFpU=
+=+lBd
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 277e819ee83f..e22246fad78d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2022 11:39:41 +0000
+Sun, 10 Jul 2022 14:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 59305c8dd682..177672ac28e0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul  8 11:39:40 AM UTC 2022
+Sun Jul 10 02:39:44 PM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index bc17951a48cf..9737bbd85bfa 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -457,6 +457,7 @@
 2204101640 ./acct-group/openttd/openttd-0.ebuild
 2204271910 ./acct-group/headscale/headscale-0.ebuild
 2205140210 ./acct-group/libreoffice/libreoffice-0.ebuild
+2207091140 ./acct-group/synapse/synapse-0.ebuild
 2012281255 ./acct-user/abrt/abrt-0-r1.ebuild
 2107101509 ./acct-user/aerospike-amc/aerospike-amc-0.ebuild
 2012281255 ./acct-user/airdcppd/airdcppd-0-r1.ebuild
@@ -464,7 +465,7 @@
 2012281255 ./acct-user/alias/alias-0-r1.ebuild
 2012281809 ./acct-user/amanda/amanda-0.ebuild
 2012281255 ./acct-user/amavis/amavis-0-r1.ebuild
-2012281255 ./acct-user/amule/amule-0-r1.ebuild
+2207100210 ./acct-user/amule/amule-0-r2.ebuild
 2110281109 ./acct-user/anope/anope-0-r1.ebuild
 2205141440 ./acct-user/apache/apache-0-r2.ebuild
 2102111209 ./acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
@@ -884,6 +885,7 @@
 2205140210 ./acct-user/lightdm/lightdm-0.ebuild
 2205141440 ./acct-user/nginx/nginx-0.ebuild
 2205140210 ./acct-user/rt/rt-0.ebuild
+2207091140 ./acct-user/synapse/synapse-0.ebuild
 2107081639 ./app-accessibility/accerciser/accerciser-3.38.0.ebuild
 2205171110 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
 2206080240 ./app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
@@ -960,14 +962,9 @@
 2104290909 ./app-admin/augeas/augeas-1.12.0.ebuild
 2103271839 ./app-admin/authbind/authbind-2.1.2.ebuild
 2010061639 ./app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
-2206292140 ./app-admin/awscli/awscli-1.25.12-r1.ebuild
-2206292114 ./app-admin/awscli/awscli-1.25.17-r1.ebuild
-2206300740 ./app-admin/awscli/awscli-1.25.20.ebuild
-2207011010 ./app-admin/awscli/awscli-1.25.21.ebuild
 2207020810 ./app-admin/awscli/awscli-1.25.22.ebuild
-2207060840 ./app-admin/awscli/awscli-1.25.23.ebuild
-2207071310 ./app-admin/awscli/awscli-1.25.24.ebuild
-2207081110 ./app-admin/awscli/awscli-1.25.25.ebuild
+2207100940 ./app-admin/awscli/awscli-1.25.17-r1.ebuild
+2207091210 ./app-admin/awscli/awscli-1.25.26.ebuild
 2207050340 ./app-admin/bastille/bastille-3.0.9-r3.ebuild
 2204121639 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
 2207021040 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild
@@ -1010,6 +1007,7 @@
 2206080010 ./app-admin/doctl/doctl-1.76.2.ebuild
 2207022040 ./app-admin/doctl/doctl-1.77.0.ebuild
 2207022040 ./app-admin/doctl/doctl-9999.ebuild
+2207091540 ./app-admin/doctl/doctl-1.78.0.ebuild
 2202191640 ./app-admin/drush/drush-6.7.0-r3.ebuild
 2206121141 ./app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
 2101310342 ./app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -1117,7 +1115,6 @@
 2203242039 ./app-admin/monit/monit-5.32.0.ebuild
 2205160640 ./app-admin/mtail/mtail-3.0.0_rc36.ebuild
 2101270709 ./app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
-2101270439 ./app-admin/needrestart/needrestart-3.3.ebuild
 2103302109 ./app-admin/needrestart/needrestart-3.5.ebuild
 2205172040 ./app-admin/needrestart/needrestart-3.6.ebuild
 2205172040 ./app-admin/needrestart/needrestart-9999.ebuild
@@ -1158,6 +1155,7 @@
 2207050610 ./app-admin/puppetserver/puppetserver-7.8.0.ebuild
 2111141139 ./app-admin/pwcrypt/pwcrypt-1.2.2-r3.ebuild
 2205191040 ./app-admin/pwgen/pwgen-2.08.ebuild
+2207101110 ./app-admin/pwgen/pwgen-2.08-r1.ebuild
 2206041110 ./app-admin/pwman3/pwman3-0.10.0-r1.ebuild
 2206041110 ./app-admin/pwman3/pwman3-0.11.1.ebuild
 2205310510 ./app-admin/pydf/pydf-12-r2.ebuild
@@ -1379,8 +1377,8 @@
 2111110339 ./app-arch/tarsync/tarsync-0.2.2.ebuild
 2111170339 ./app-arch/tarsync/tarsync-0.2.3.ebuild
 2101070439 ./app-arch/torrentzip/torrentzip-0.9-r1.ebuild
-2104060140 ./app-arch/unace/unace-2.5-r5.ebuild
-2012311940 ./app-arch/unadf/unadf-0.7.12-r1.ebuild
+2207101410 ./app-arch/unace/unace-2.5-r6.ebuild
+2207101410 ./app-arch/unadf/unadf-0.7.12-r2.ebuild
 2005301209 ./app-arch/unar/unar-1.10.7.ebuild
 2205032110 ./app-arch/unp/unp-2.0_pre9.ebuild
 2206020910 ./app-arch/unrar/unrar-6.1.7.ebuild
@@ -1404,7 +1402,7 @@
 2105050139 ./app-arch/zoo/zoo-2.10-r5.ebuild
 2205081810 ./app-arch/zopfli/zopfli-1.0.3.ebuild
 2104180939 ./app-arch/zpaq-extras/zpaq-extras-3.ebuild
-2206100840 ./app-arch/zpaq/zpaq-7.15.ebuild
+2207101410 ./app-arch/zpaq/zpaq-7.15-r1.ebuild
 2108290510 ./app-arch/zstd/zstd-1.4.9.ebuild
 2204290540 ./app-arch/zstd/zstd-1.5.2.ebuild
 2206181640 ./app-arch/zstd/zstd-1.5.2-r1.ebuild
@@ -1601,7 +1599,7 @@
 2107161509 ./app-crypt/aescrypt/aescrypt-3.14.ebuild
 1809280333 ./app-crypt/aespipe/aespipe-2.4e.ebuild
 2103110539 ./app-crypt/aespipe/aespipe-2.4f.ebuild
-2109090739 ./app-crypt/age/age-1.0.0.ebuild
+2207100940 ./app-crypt/age/age-1.0.0.ebuild
 2205190511 ./app-crypt/argon2/argon2-20190702-r1.ebuild
 2103052109 ./app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
 2006062109 ./app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@@ -1762,6 +1760,7 @@
 2201291609 ./app-crypt/pdfcrack/pdfcrack-0.19.ebuild
 2202142309 ./app-crypt/pesign/pesign-114.ebuild
 2008040739 ./app-crypt/pgpdump/pgpdump-0.33.ebuild
+2207091410 ./app-crypt/pgpdump/pgpdump-0.35.ebuild
 2205170910 ./app-crypt/pinentry/pinentry-1.2.0.ebuild
 2206180010 ./app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
 2205310540 ./app-crypt/pius/pius-3.0.0-r1.ebuild
@@ -1785,7 +1784,7 @@
 2104060140 ./app-crypt/shash/shash-0.2.6-r3.ebuild
 2012202239 ./app-crypt/signify/signify-30.ebuild
 2204290652 ./app-crypt/signify/signify-30-r2.ebuild
-2207081340 ./app-crypt/signify/signify-31.ebuild
+2207091140 ./app-crypt/signify/signify-31.ebuild
 2205062310 ./app-crypt/signing-party/signing-party-2.11.ebuild
 2105022039 ./app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
 1905062039 ./app-crypt/ssdeep/ssdeep-2.14.1.ebuild
@@ -2627,6 +2626,7 @@
 2110291639 ./app-editors/moe/moe-1.11.ebuild
 1808152309 ./app-editors/moe/moe-1.9.ebuild
 2206070240 ./app-editors/mousepad/mousepad-0.5.9.ebuild
+2207092340 ./app-editors/mousepad/mousepad-0.5.10.ebuild
 2206142040 ./app-editors/nano/nano-6.2.ebuild
 2206301010 ./app-editors/nano/nano-6.3.ebuild
 2206301010 ./app-editors/nano/nano-9999.ebuild
@@ -2790,7 +2790,7 @@
 2206262140 ./app-emacs/eglot/eglot-1.8-r1.ebuild
 2004051339 ./app-emacs/elscreen/elscreen-20180321.ebuild
 2204210039 ./app-emacs/emacs-common/emacs-common-1.8.ebuild
-2204210039 ./app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
+2207101540 ./app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
 2204051339 ./app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
 1909072339 ./app-emacs/emacs-w3m/emacs-w3m-1.4.632_pre20181112.ebuild
 2104122109 ./app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild
@@ -3038,8 +3038,8 @@
 2202172339 ./app-emacs/marginalia/marginalia-0.12.ebuild
 2203271239 ./app-emacs/marginalia/marginalia-0.13.ebuild
 2202271339 ./app-emacs/orderless/orderless-0.7.ebuild
-2205211140 ./app-emacs/vertico/vertico-0.23.ebuild
 2205291110 ./app-emacs/vertico/vertico-0.24.ebuild
+2207101210 ./app-emacs/vertico/vertico-0.25.ebuild
 2202201240 ./app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild
 2202181609 ./app-emacs/setup/setup-1.2.0.ebuild
 2206191510 ./app-emacs/setup/setup-1.3.0.ebuild
@@ -3177,12 +3177,17 @@
 2206030310 ./app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
 2206051940 ./app-emacs/git-modes/git-modes-1.4.0.ebuild
 2206191510 ./app-emacs/corfu/corfu-0.25.ebuild
+2207101210 ./app-emacs/corfu/corfu-0.26.ebuild
 2206251640 ./app-emacs/demap/demap-1.4.0.ebuild
 2206232010 ./app-emacs/web-mode/web-mode-17.2.1.ebuild
 2206261940 ./app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
 2206261940 ./app-emacs/tablist/tablist-1.0.ebuild
 2206292310 ./app-emacs/clojure-mode/clojure-mode-5.14.0.ebuild
 2206292310 ./app-emacs/inf-clojure/inf-clojure-3.1.0.ebuild
+2207090240 ./app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
+2207090240 ./app-emacs/emacs-eix/emacs-eix-9999.ebuild
+2207090240 ./app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
+2207090240 ./app-emacs/emacs-openrc/emacs-openrc-9999.ebuild
 2201021453 ./app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
 2204170010 ./app-emulation/aranym/aranym-1.1.0.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
@@ -3343,12 +3348,12 @@
 2204290440 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
 2205040610 ./app-emulation/xen-tools/xen-tools-4.15.2-r2.ebuild
 2207051940 ./app-emulation/xen-tools/xen-tools-4.16.1.ebuild
-2207062210 ./app-emulation/xen-tools/xen-tools-4.15.3.ebuild
 2207071010 ./app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
+2207100940 ./app-emulation/xen-tools/xen-tools-4.15.3.ebuild
 2205040610 ./app-emulation/xen/xen-4.15.2-r2.ebuild
-2207051940 ./app-emulation/xen/xen-4.15.3.ebuild
 2207051940 ./app-emulation/xen/xen-4.16.1.ebuild
 2207071010 ./app-emulation/xen/xen-4.16.2_pre1.ebuild
+2207100940 ./app-emulation/xen/xen-4.15.3.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2206281115 ./app-emulation/ruffle/ruffle-0_p20220516.ebuild
 2206281115 ./app-emulation/ruffle/ruffle-0_p20220614.ebuild
@@ -3399,7 +3404,7 @@
 2205191040 ./app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
 2104060140 ./app-eselect/eselect-python/eselect-python-20200719.ebuild
 2109080039 ./app-eselect/eselect-rails/eselect-rails-0.25.ebuild
-2202020939 ./app-eselect/eselect-repository/eselect-repository-12.ebuild
+2207090910 ./app-eselect/eselect-repository/eselect-repository-12.ebuild
 2111171139 ./app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
 2107210239 ./app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
 2205081810 ./app-eselect/eselect-ruby/eselect-ruby-20220313.ebuild
@@ -3408,7 +3413,7 @@
 2112210709 ./app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
 2008091909 ./app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
 2112210709 ./app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
-2109021309 ./app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+2207101440 ./app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
 2101170739 ./app-eselect/eselect-unison/eselect-unison-0.4.ebuild
 2112060110 ./app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild
 2205071440 ./app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -3497,8 +3502,7 @@
 1708231827 ./app-i18n/ibus-input-pad/ibus-input-pad-1.4.99_pre20140916.ebuild
 2110141609 ./app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
 2207041040 ./app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
-2111270940 ./app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
-2202101709 ./app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
+2207090510 ./app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
 2201301339 ./app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
 2012281739 ./app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
 2102270209 ./app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
@@ -3510,9 +3514,9 @@
 2206121710 ./app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild
 2206121710 ./app-i18n/ibus-table/ibus-table-1.16.8.ebuild
 2206201610 ./app-i18n/ibus-table/ibus-table-1.16.9.ebuild
-2206081740 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild
-2206081740 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
 2206291710 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
+2207090510 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
+2207090510 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.17.0.ebuild
 2111181639 ./app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
 2112132239 ./app-i18n/ibus/ibus-1.5.25-r1.ebuild
 2205311240 ./app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -3760,11 +3764,12 @@
 2101310343 ./app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
 2206080940 ./app-misc/chkcrontab/chkcrontab-1.7-r2.ebuild
 2203020609 ./app-misc/ckb/ckb-0.4.4-r2.ebuild
+2207082340 ./app-misc/ckb/ckb-0.5.0.ebuild
+2207082340 ./app-misc/ckb/ckb-9999.ebuild
 2104250839 ./app-misc/ckermit/ckermit-9.0.302.ebuild
 1908261239 ./app-misc/clockywock/clockywock-0.3.1a.ebuild
 2107180039 ./app-misc/cmatrix/cmatrix-2.0-r4.ebuild
 2104040109 ./app-misc/color/color-1.2-r2.ebuild
-2101061639 ./app-misc/colordiff/colordiff-1.0.18.ebuild
 2101061639 ./app-misc/colordiff/colordiff-1.0.19.ebuild
 2112141909 ./app-misc/conmux/conmux-0.16.4.ebuild
 2002112051 ./app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -3948,9 +3953,9 @@
 2102110639 ./app-misc/muttprint/muttprint-0.73-r5.ebuild
 2203200240 ./app-misc/mvcase/mvcase-0.1-r2.ebuild
 2202100210 ./app-misc/mx5000tools/mx5000tools-0.1.2-r2.ebuild
-2205140210 ./app-misc/neofetch/neofetch-7.1.0-r1.ebuild
 2205140210 ./app-misc/neofetch/neofetch-7.1.0.ebuild
 2205140210 ./app-misc/neofetch/neofetch-9999.ebuild
+2207091340 ./app-misc/neofetch/neofetch-7.1.0-r1.ebuild
 2104230039 ./app-misc/nnn/nnn-4.0.ebuild
 2111201739 ./app-misc/nnn/nnn-4.3.ebuild
 2206240710 ./app-misc/nnn/nnn-4.5.ebuild
@@ -4003,7 +4008,7 @@
 2205220040 ./app-misc/ranger/ranger-1.9.3.ebuild
 2205220040 ./app-misc/ranger/ranger-9999.ebuild
 2104031909 ./app-misc/razertool/razertool-0.0.7-r4.ebuild
-2207081410 ./app-misc/rbutil/rbutil-1.5.1.ebuild
+2207081510 ./app-misc/rbutil/rbutil-1.5.1.ebuild
 2204271640 ./app-misc/rdfind/rdfind-1.5.0.ebuild
 2104190739 ./app-misc/realpath/realpath-1.18.ebuild
 2112091939 ./app-misc/recoll/recoll-1.31.0.ebuild
@@ -4036,6 +4041,7 @@
 2205051340 ./app-misc/screenfetch/screenfetch-9999.ebuild
 2012311940 ./app-misc/screenie/screenie-20120406.ebuild
 2206250010 ./app-misc/scrub/scrub-2.6.1.ebuild
+2207101440 ./app-misc/scrub/scrub-2.6.1-r1.ebuild
 1807111209 ./app-misc/selecta/selecta-0.0.7.ebuild
 1807111209 ./app-misc/selecta/selecta-9999.ebuild
 2112252040 ./app-misc/siglo/siglo-0.9.6.ebuild
@@ -4184,6 +4190,7 @@
 2112052209 ./app-office/homebank/homebank-5.5.2-r1.ebuild
 2202111809 ./app-office/homebank/homebank-5.5.4.ebuild
 2104042209 ./app-office/impressive/impressive-0.13.0_beta2.ebuild
+2207091010 ./app-office/impressive/impressive-0.13.1.ebuild
 2203020709 ./app-office/kexi/kexi-3.2.0-r3.ebuild
 2202172209 ./app-office/kmymoney/kmymoney-5.1.2-r1.ebuild
 2009300139 ./app-office/kraft/kraft-0.95.ebuild
@@ -4345,8 +4352,7 @@
 2201290910 ./app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
 2008291939 ./app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
 2008291939 ./app-portage/repo-commit/repo-commit-9999.ebuild
-2108152309 ./app-portage/repoman/repoman-3.0.3-r1.ebuild
-2106060939 ./app-portage/repoman/repoman-9999.ebuild
+2207090910 ./app-portage/repoman/repoman-3.0.3-r2.ebuild
 2206051040 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
 2206051040 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
 2205190610 ./app-portage/tatt/tatt-9999.ebuild
@@ -4390,7 +4396,7 @@
 2206192210 ./app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211-r1.ebuild
 2103200809 ./app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
 2204150940 ./app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
-2205102010 ./app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
+2207101540 ./app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
 2111142139 ./app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild
 2107180039 ./app-shells/hstr/hstr-2.2-r1.ebuild
 2109052209 ./app-shells/ksh/ksh-2020.0.0-r1.ebuild
@@ -4419,7 +4425,6 @@
 2205200511 ./app-shells/powerline/powerline-2.7-r2.ebuild
 2205200511 ./app-shells/powerline/powerline-9999.ebuild
 2207030110 ./app-shells/psh/psh-1.8.1-r4.ebuild
-2104060140 ./app-shells/push/push-2.0-r1.ebuild
 2205090840 ./app-shells/push/push-3.4.ebuild
 2206022010 ./app-shells/pwsh-bin/pwsh-bin-7.2.1-r1.ebuild
 2206022010 ./app-shells/pwsh-bin/pwsh-bin-7.2.4.ebuild
@@ -4441,7 +4446,7 @@
 2207011010 ./app-shells/starship/starship-1.9.1.ebuild
 2202091140 ./app-shells/tcsh/tcsh-6.22.02-r1.ebuild
 2207071410 ./app-shells/tcsh/tcsh-6.24.01.ebuild
-2207081110 ./app-shells/tcsh/tcsh-6.24.00.ebuild
+2207091540 ./app-shells/tcsh/tcsh-6.24.00.ebuild
 2101310343 ./app-shells/thefuck/thefuck-3.30.ebuild
 2204162240 ./app-shells/thefuck/thefuck-3.32.ebuild
 1708212327 ./app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild
@@ -4723,9 +4728,10 @@
 2202272009 ./app-text/podofo/podofo-0.9.7.ebuild
 2104060140 ./app-text/poppler-data/poppler-data-0.4.10.ebuild
 2205171610 ./app-text/poppler-data/poppler-data-0.4.11.ebuild
-2206030940 ./app-text/poppler/poppler-9999.ebuild
 2206060210 ./app-text/poppler/poppler-22.06.0.ebuild
 2206190210 ./app-text/poppler/poppler-22.05.0.ebuild
+2207090040 ./app-text/poppler/poppler-22.07.0.ebuild
+2207090040 ./app-text/poppler/poppler-9999.ebuild
 2112132209 ./app-text/ps2eps/ps2eps-1.68.ebuild
 2205141340 ./app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
 2002280339 ./app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -4780,7 +4786,6 @@
 2202140039 ./app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
 2205241210 ./app-text/sword-modules/sword-modules-2.6.ebuild
 2205191040 ./app-text/sword/sword-1.9.0-r1.ebuild
-2107270239 ./app-text/t1utils/t1utils-1.41-r2.ebuild
 2112061839 ./app-text/t1utils/t1utils-1.42.ebuild
 2005171539 ./app-text/tabler/tabler-2-r1.ebuild
 2104192239 ./app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -4822,7 +4827,7 @@
 2111010439 ./app-text/vgrep/vgrep-2.5.5.ebuild
 2201260539 ./app-text/vgrep/vgrep-2.6.0.ebuild
 2105141009 ./app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
-2201260039 ./app-text/wdiff/wdiff-1.2.2-r1.ebuild
+2207101440 ./app-text/wdiff/wdiff-1.2.2-r2.ebuild
 2103081039 ./app-text/webgen/webgen-1.7.2.ebuild
 2204121410 ./app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
 2204121410 ./app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
@@ -4837,6 +4842,7 @@
 2012311940 ./app-text/xapian-omega/xapian-omega-1.4.17.ebuild
 2201030209 ./app-text/xapian-omega/xapian-omega-1.4.18.ebuild
 2207010110 ./app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+2207091940 ./app-text/xapian-omega/xapian-omega-1.4.20.ebuild
 2202241609 ./app-text/xchm/xchm-1.33.ebuild
 2112132209 ./app-text/xdvik/xdvik-22.87.03-r3.ebuild
 2205140410 ./app-text/xdvik/xdvik-22.87.03-r4.ebuild
@@ -5401,6 +5407,7 @@
 2206071140 ./dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
 2207080410 ./dev-cpp/folly/folly-2022.03.28.00-r1.ebuild
 2207080410 ./dev-cpp/folly/folly-2022.04.11.00-r1.ebuild
+2207090740 ./dev-cpp/folly/folly-2022.07.04.00.ebuild
 2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
 2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
 2206081140 ./dev-cpp/highway/highway-0.17.0.ebuild
@@ -5598,11 +5605,10 @@
 2110020309 ./dev-db/qdbm/qdbm-1.8.78-r3.ebuild
 2202271309 ./dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
 2206130010 ./dev-db/redis/redis-6.2.7-r1.ebuild
-2206160040 ./dev-db/redis/redis-7.0.2.ebuild
-2207021810 ./dev-db/redis/redis-5.0.14.ebuild
 2207021810 ./dev-db/redis/redis-6.0.16.ebuild
 2207021810 ./dev-db/redis/redis-6.2.6.ebuild
-2207041340 ./dev-db/redis/redis-7.0.1-r1.ebuild
+2207091110 ./dev-db/redis/redis-7.0.1-r1.ebuild
+2207091110 ./dev-db/redis/redis-7.0.2.ebuild
 2101040109 ./dev-db/repmgr/repmgr-5.1.0.ebuild
 2205160210 ./dev-db/rqlite/rqlite-7.4.0.ebuild
 2206020640 ./dev-db/rqlite/rqlite-7.5.0.ebuild
@@ -5667,6 +5673,7 @@
 2011142339 ./dev-embedded/avrdude/avrdude-6.3.ebuild
 2111120512 ./dev-embedded/avrdude/avrdude-9999.ebuild
 2202071639 ./dev-embedded/avrdude/avrdude-6.3-r1.ebuild
+2207101110 ./dev-embedded/avrdude/avrdude-7.0.ebuild
 2006061309 ./dev-embedded/cpik/cpik-0.7.4_p4.ebuild
 2009161739 ./dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
 2111150540 ./dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
@@ -6750,16 +6757,11 @@
 2206010140 ./dev-java/batik/batik-1.14-r1.ebuild
 2104141939 ./dev-java/bcel/bcel-6.5.0.ebuild
 2201272040 ./dev-java/bcel/bcel-6.5.0-r3.ebuild
-2203070310 ./dev-java/bcmail/bcmail-1.69-r1.ebuild
-2207070940 ./dev-java/bcmail/bcmail-1.71.ebuild
-2111250739 ./dev-java/bcpg/bcpg-1.69.ebuild
-2207070940 ./dev-java/bcpg/bcpg-1.71.ebuild
-2111250739 ./dev-java/bcpkix/bcpkix-1.69.ebuild
-2207070940 ./dev-java/bcpkix/bcpkix-1.71-r1.ebuild
-2111250739 ./dev-java/bcprov/bcprov-1.69.ebuild
-2207070940 ./dev-java/bcprov/bcprov-1.71-r1.ebuild
-2111250739 ./dev-java/bcutil/bcutil-1.69.ebuild
-2207070940 ./dev-java/bcutil/bcutil-1.71.ebuild
+2207091540 ./dev-java/bcmail/bcmail-1.71.ebuild
+2207091540 ./dev-java/bcpg/bcpg-1.71.ebuild
+2207091540 ./dev-java/bcpkix/bcpkix-1.71-r1.ebuild
+2207091540 ./dev-java/bcprov/bcprov-1.71-r1.ebuild
+2207091540 ./dev-java/bcutil/bcutil-1.71.ebuild
 2110200610 ./dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild
 2202090440 ./dev-java/bndlib/bndlib-2.1.0-r1.ebuild
 2112222209 ./dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -6865,7 +6867,7 @@
 2103262209 ./dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
 2206081210 ./dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
 2112011039 ./dev-java/javassist/javassist-3.18.2-r1.ebuild
-2207051510 ./dev-java/javassist/javassist-3.29.0.ebuild
+2207092110 ./dev-java/javassist/javassist-3.29.0.ebuild
 2112251340 ./dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
 2204271440 ./dev-java/javax-inject/javax-inject-1-r4.ebuild
 2206070240 ./dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
@@ -6887,9 +6889,9 @@
 2202271209 ./dev-java/jdepend/jdepend-2.10.ebuild
 2104191439 ./dev-java/jdom/jdom-1.1.3-r1.ebuild
 2206221640 ./dev-java/jdom/jdom-2.0.6.1.ebuild
-2111232009 ./dev-java/jffi/jffi-1.3.6.ebuild
 2112271940 ./dev-java/jffi/jffi-1.2.9-r1.ebuild
-2207081010 ./dev-java/jffi/jffi-1.3.9.ebuild
+2207091510 ./dev-java/jffi/jffi-1.3.6.ebuild
+2207091310 ./dev-java/jffi/jffi-1.3.9.ebuild
 2111111409 ./dev-java/jflex/jflex-1.6.1-r1.ebuild
 2103121539 ./dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
 2203152309 ./dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
@@ -6902,13 +6904,12 @@
 2207062140 ./dev-java/jna/jna-5.11.0.ebuild
 2112222209 ./dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
 2112311309 ./dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
-2111232009 ./dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
 2112271940 ./dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
-2207081010 ./dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+2207091310 ./dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
 2201102240 ./dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
-2207081010 ./dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+2207091310 ./dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
 2201102240 ./dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
-2207081010 ./dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
+2207091310 ./dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
 2112222209 ./dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
 2203121639 ./dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
 2112171409 ./dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -7023,12 +7024,12 @@
 2201282340 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
 2202090440 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
 2202090440 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
-2206120710 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
-2206101010 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
-2206140710 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
 2206170210 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
 2206170210 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
 2206170210 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
+2207101540 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
+2207101540 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
+2207101540 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
 2203170340 ./dev-java/treelayout/treelayout-1.0.3-r1.ebuild
 2201262240 ./dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
 2204270910 ./dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -7041,8 +7042,7 @@
 2203061209 ./dev-java/xerces/xerces-2.12.2.ebuild
 2203170440 ./dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
 2201191309 ./dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
-2112150139 ./dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
-2206081140 ./dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
+2207091410 ./dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
 2206171610 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
 2204122140 ./dev-java/xmlunit/xmlunit-1.6-r1.ebuild
 2105161809 ./dev-java/xom/xom-1.3.7.ebuild
@@ -7147,11 +7147,12 @@
 2203091240 ./dev-lang/elixir/elixir-1.12.3.ebuild
 2205251240 ./dev-lang/elixir/elixir-1.13.3.ebuild
 2205271010 ./dev-lang/elixir/elixir-1.13.4.ebuild
-2204191639 ./dev-lang/erlang/erlang-23.3.4.12.ebuild
-2204192009 ./dev-lang/erlang/erlang-24.3.3.ebuild
-2205051740 ./dev-lang/erlang/erlang-23.3.4.14-r1.ebuild
-2205051740 ./dev-lang/erlang/erlang-24.3.4.ebuild
-2207031410 ./dev-lang/erlang/erlang-25.0.ebuild
+2207091140 ./dev-lang/erlang/erlang-23.3.4.12-r1.ebuild
+2207091240 ./dev-lang/erlang/erlang-23.3.4.15.ebuild
+2207091140 ./dev-lang/erlang/erlang-24.3.3-r1.ebuild
+2207091240 ./dev-lang/erlang/erlang-24.3.4.2.ebuild
+2207091140 ./dev-lang/erlang/erlang-25.0-r1.ebuild
+2207091240 ./dev-lang/erlang/erlang-25.0.2.ebuild
 1702282250 ./dev-lang/esco/esco-0.512.ebuild
 2206250910 ./dev-lang/execline/execline-2.8.3.0-r1.ebuild
 2206250910 ./dev-lang/execline/execline-2.9.0.0.ebuild
@@ -7277,9 +7278,8 @@
 2206241240 ./dev-lang/perl/perl-5.34.1-r3.ebuild
 2206220940 ./dev-lang/php/php-7.4.30.ebuild
 2206220940 ./dev-lang/php/php-8.0.20.ebuild
-2206220940 ./dev-lang/php/php-8.1.7.ebuild
 2207072240 ./dev-lang/php/php-8.0.21.ebuild
-2207072240 ./dev-lang/php/php-8.1.8.ebuild
+2207091540 ./dev-lang/php/php-8.1.8.ebuild
 2201040239 ./dev-lang/polyml/polyml-5.8.2.ebuild
 2201040239 ./dev-lang/polyml/polyml-5.8.ebuild
 2207022340 ./dev-lang/polyml/polyml-5.9-r1.ebuild
@@ -7294,6 +7294,7 @@
 2206251010 ./dev-lang/python/python-3.9.13.ebuild
 2207021040 ./dev-lang/python/python-3.10.5.ebuild
 2207061940 ./dev-lang/python/python-3.11.0_beta3_p1.ebuild
+2207081640 ./dev-lang/python/python-3.11.0_beta3_p2.ebuild
 2205210910 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -7335,7 +7336,6 @@
 2205141840 ./dev-lang/swi-prolog/swi-prolog-8.5.11.ebuild
 2206041110 ./dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
 2206040940 ./dev-lang/swi-prolog/swi-prolog-8.5.12.ebuild
-2101062239 ./dev-lang/swig/swig-3.0.12.ebuild
 2205010512 ./dev-lang/swig/swig-4.0.2.ebuild
 2201012339 ./dev-lang/tcc/tcc-9999.ebuild
 2202071210 ./dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
@@ -7374,7 +7374,7 @@
 2206301840 ./dev-lang/dafny-bin/dafny-bin-3.7.1-r2.ebuild
 2207061610 ./dev-lang/eisl/eisl-2.50.ebuild
 2110291639 ./dev-libs/9libs/9libs-1.0-r4.ebuild
-2206261110 ./dev-libs/Ice/Ice-3.6.5-r2.ebuild
+2207090940 ./dev-libs/Ice/Ice-3.6.5-r2.ebuild
 2107081409 ./dev-libs/OpenNI/OpenNI-9999.ebuild
 2205191540 ./dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
 2107081409 ./dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -7567,7 +7567,7 @@
 2104060140 ./dev-libs/hiredis/hiredis-0.14.1.ebuild
 2203160540 ./dev-libs/hiredis/hiredis-1.0.2-r2.ebuild
 2011142339 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
-2202052209 ./dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+2207091110 ./dev-libs/hyperscan/hyperscan-5.4.0.ebuild
 2106020609 ./dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
 2112260340 ./dev-libs/icinga-php-library/icinga-php-library-0.6.1-r1.ebuild
 2205100410 ./dev-libs/icinga-php-library/icinga-php-library-0.8.1.ebuild
@@ -7587,12 +7587,11 @@
 2104060140 ./dev-libs/iniparser/iniparser-3.1-r2.ebuild
 2104060140 ./dev-libs/iniparser/iniparser-4.1.ebuild
 2008201709 ./dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
-2206051810 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
 2206112040 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
-2206272310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
 2206282310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
 2206282310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
 2207021810 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.26.23599.ebuild
+2207100040 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
 2205041140 ./dev-libs/isl/isl-0.24-r2.ebuild
 2207050740 ./dev-libs/isl/isl-0.25.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -7661,6 +7660,7 @@
 2206020340 ./dev-libs/libcbor/libcbor-0.9.0.ebuild
 2104112309 ./dev-libs/libcdada/libcdada-0.3.4-r2.ebuild
 2112100710 ./dev-libs/libcdada/libcdada-0.3.5.ebuild
+2207090710 ./dev-libs/libcdada/libcdada-0.4.0.ebuild
 2108240209 ./dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
 2101062239 ./dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
 2108100309 ./dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -7715,8 +7715,8 @@
 1910071409 ./dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
 2204171840 ./dev-libs/libezV24/libezV24-0.1.1-r2.ebuild
 2002230040 ./dev-libs/libf2c/libf2c-20130927-r1.ebuild
-2206051640 ./dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
-2206051640 ./dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
+2207090640 ./dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
+2207090640 ./dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
 2201061240 ./dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
 2206142010 ./dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
 2201061240 ./dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -7796,7 +7796,7 @@
 2104031909 ./dev-libs/liblist/liblist-2.4-r1.ebuild
 2110212139 ./dev-libs/liblogging/liblogging-1.0.6-r1.ebuild
 2105160309 ./dev-libs/liblogging/liblogging-1.0.6.ebuild
-2105160309 ./dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+2207091410 ./dev-libs/liblognorm/liblognorm-2.0.6.ebuild
 2101310343 ./dev-libs/liblouis/liblouis-3.13.0.ebuild
 2112011009 ./dev-libs/liblouis/liblouis-3.17.0.ebuild
 2201271940 ./dev-libs/liblouis/liblouis-3.20.0.ebuild
@@ -7818,8 +7818,7 @@
 2110140639 ./dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
 2201020309 ./dev-libs/libmirage/libmirage-3.2.6.ebuild
 2107160439 ./dev-libs/libmix/libmix-2.05-r7.ebuild
-2003031839 ./dev-libs/libmodbus/libmodbus-3.1.6.ebuild
-2206061240 ./dev-libs/libmodbus/libmodbus-3.1.7.ebuild
+2207100040 ./dev-libs/libmodbus/libmodbus-3.1.7.ebuild
 2106300139 ./dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
 2109241040 ./dev-libs/libmowgli/libmowgli-9999.ebuild
 2202061109 ./dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
@@ -7910,6 +7909,7 @@
 1912110241 ./dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
 2203231209 ./dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
 2206281115 ./dev-libs/libstrophe/libstrophe-0.12.0.ebuild
+2207091410 ./dev-libs/libstrophe/libstrophe-0.12.1.ebuild
 2108210239 ./dev-libs/libtar/libtar-1.2.20-r4.ebuild
 2207010210 ./dev-libs/libtasn1/libtasn1-4.18.0.ebuild
 2204302110 ./dev-libs/libtecla/libtecla-1.6.3.ebuild
@@ -7922,6 +7922,7 @@
 2110280409 ./dev-libs/libtommath/libtommath-1.2.0-r2.ebuild
 1911300139 ./dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
 2205201240 ./dev-libs/libtpms/libtpms-0.9.4.ebuild
+2207091540 ./dev-libs/libtpms/libtpms-0.9.5.ebuild
 2011142339 ./dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
 2202192010 ./dev-libs/libtsm/libtsm-4.0.1.ebuild
 2202192010 ./dev-libs/libtsm/libtsm-4.0.2.ebuild
@@ -8000,7 +8001,6 @@
 2206230740 ./dev-libs/marisa/marisa-0.2.6.ebuild
 2202280239 ./dev-libs/mathjax/mathjax-2.7.7.ebuild
 2205281710 ./dev-libs/metee/metee-3.1.3.ebuild
-2204131310 ./dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
 2205281310 ./dev-libs/mimalloc/mimalloc-2.0.6.ebuild
 2203220309 ./dev-libs/mimetic/mimetic-0.9.8.ebuild
 2203122239 ./dev-libs/miniz/miniz-2.2.0.ebuild
@@ -8008,7 +8008,7 @@
 2207031210 ./dev-libs/miniz/miniz-2.2.0-r1.ebuild
 2108291209 ./dev-libs/mm/mm-1.4.2-r2.ebuild
 2201131910 ./dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
-2205131740 ./dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
+2207091810 ./dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild
 2204290540 ./dev-libs/mpc/mpc-1.2.1.ebuild
 2111091009 ./dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
 2204290540 ./dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -8067,8 +8067,7 @@
 2206302240 ./dev-libs/openssl/openssl-3.0.4-r1.ebuild
 2207060240 ./dev-libs/openssl/openssl-1.1.1q.ebuild
 2207060140 ./dev-libs/openssl/openssl-3.0.5.ebuild
-2203171639 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
-2207021940 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+2207100940 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
 2108271839 ./dev-libs/pakchois/pakchois-0.4-r2.ebuild
 2102271339 ./dev-libs/papi/papi-6.0.0.1.ebuild
 2107310339 ./dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
@@ -8269,6 +8268,7 @@
 2207021610 ./dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
 2205100440 ./dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
 2205132210 ./dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
+2207100310 ./dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
 2205090610 ./dev-libs/wayland/wayland-1.20.0.ebuild
 2207040140 ./dev-libs/wayland/wayland-1.21.0.ebuild
 2207040140 ./dev-libs/wayland/wayland-9999.ebuild
@@ -8278,10 +8278,12 @@
 2002182239 ./dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
 2107072239 ./dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
 2207010110 ./dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
+2207091910 ./dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
 2107101839 ./dev-libs/xapian/xapian-1.2.25-r1.ebuild
 2107101839 ./dev-libs/xapian/xapian-1.4.17-r1.ebuild
 2201030209 ./dev-libs/xapian/xapian-1.4.18-r1.ebuild
 2207010110 ./dev-libs/xapian/xapian-1.4.19.ebuild
+2207091910 ./dev-libs/xapian/xapian-1.4.20.ebuild
 1810142309 ./dev-libs/xbyak/xbyak-5.73.ebuild
 2204121410 ./dev-libs/xerces-c/xerces-c-9999.ebuild
 2204261810 ./dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -8315,6 +8317,7 @@
 2112200739 ./dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
 2112200739 ./dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
 2112200739 ./dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
+2207101210 ./dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
 2112200739 ./dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild
 2112200739 ./dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
 2112200739 ./dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild
@@ -8352,6 +8355,7 @@
 2206200940 ./dev-libs/pocketfft/pocketfft-2021.11.23.ebuild
 2207031340 ./dev-libs/cudnn-frontend/cudnn-frontend-0.6.2.ebuild
 2207070940 ./dev-libs/castxml/castxml-0.4.5.ebuild
+2207101610 ./dev-libs/qcoro5/qcoro5-0.6.0.ebuild
 2112260340 ./dev-lisp/abcl/abcl-1.8.0.ebuild
 2205132310 ./dev-lisp/alexandria/alexandria-1.4.ebuild
 2205150110 ./dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -9177,6 +9181,7 @@
 2108031409 ./dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
 2105152109 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
 2112060009 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.320.0.ebuild
+2207090910 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.330.0.ebuild
 2105150609 ./dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
 2112081340 ./dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
 2009212339 ./dev-perl/Crypt-PWSafe3/Crypt-PWSafe3-1.220.0.ebuild
@@ -10527,6 +10532,7 @@
 2110021639 ./dev-perl/URI-redis/URI-redis-0.20.0-r1.ebuild
 2112100110 ./dev-perl/URI/URI-5.90.0.ebuild
 2205090840 ./dev-perl/URI/URI-5.100.0.ebuild
+2207090910 ./dev-perl/URI/URI-5.110.0.ebuild
 2110021639 ./dev-perl/USB-LibUSB/USB-LibUSB-0.90.0-r1.ebuild
 2111052039 ./dev-perl/USB-TMC/USB-TMC-0.9.0.ebuild
 2110021909 ./dev-perl/UUID-Tiny/UUID-Tiny-1.40.0-r2.ebuild
@@ -11126,6 +11132,7 @@
 2206201010 ./dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
 2206270810 ./dev-python/PyPDF2/PyPDF2-2.4.0.ebuild
 2206302040 ./dev-python/PyPDF2/PyPDF2-2.4.1.ebuild
+2207091210 ./dev-python/PyPDF2/PyPDF2-2.4.2.ebuild
 2206082240 ./dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
 2202042209 ./dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
 2206082240 ./dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild
@@ -11150,7 +11157,8 @@
 2205271240 ./dev-python/aesara/aesara-2.6.6.ebuild
 2206041010 ./dev-python/aesara/aesara-2.7.0.ebuild
 2206051240 ./dev-python/aesara/aesara-2.7.1.ebuild
-2206182140 ./dev-python/aesara/aesara-2.7.3.ebuild
+2207101540 ./dev-python/aesara/aesara-2.7.3.ebuild
+2207101440 ./dev-python/aesara/aesara-2.7.5.ebuild
 2112260340 ./dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
 2112260340 ./dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
 2112260340 ./dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
@@ -11180,6 +11188,7 @@
 2205122240 ./dev-python/ansi/ansi-0.3.6.ebuild
 2206252010 ./dev-python/ansi2html/ansi2html-1.7.0.ebuild
 2207072240 ./dev-python/ansi2html/ansi2html-1.8.0.ebuild
+2207091940 ./dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
 2201271740 ./dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild
 2203160139 ./dev-python/ansible-runner/ansible-runner-1.4.9.ebuild
 2205181410 ./dev-python/ansicolor/ansicolor-9999.ebuild
@@ -11204,6 +11213,7 @@
 2205271240 ./dev-python/astor/astor-0.8.1-r1.ebuild
 2205311140 ./dev-python/astroid/astroid-2.11.5.ebuild
 2206132010 ./dev-python/astroid/astroid-2.11.6.ebuild
+2207092110 ./dev-python/astroid/astroid-2.12.0.ebuild
 2205080740 ./dev-python/asttokens/asttokens-2.0.5.ebuild
 2112240209 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2205122240 ./dev-python/async-lru/async-lru-1.0.3.ebuild
@@ -11215,6 +11225,7 @@
 2206221640 ./dev-python/audioread/audioread-2.1.9-r1.ebuild
 2206131940 ./dev-python/authres/authres-1.2.0-r1.ebuild
 2207051040 ./dev-python/autobahn/autobahn-22.5.1-r1.ebuild
+2207091210 ./dev-python/autobahn/autobahn-22.6.1.ebuild
 2206142240 ./dev-python/automat/automat-20.2.0-r1.ebuild
 2206272240 ./dev-python/autopage/autopage-0.5.1.ebuild
 2111270009 ./dev-python/autopep8/autopep8-1.6.0.ebuild
@@ -11250,6 +11261,7 @@
 2110161709 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
 2206212140 ./dev-python/betamax/betamax-0.8.1-r1.ebuild
 2205211110 ./dev-python/bibtexparser/bibtexparser-1.2.0-r2.ebuild
+2207092110 ./dev-python/bibtexparser/bibtexparser-1.3.0.ebuild
 2206252010 ./dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
 2206061240 ./dev-python/bitarray/bitarray-2.5.1.ebuild
 2205122240 ./dev-python/bitstring/bitstring-3.1.9.ebuild
@@ -11268,23 +11280,13 @@
 2205141040 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
 2112141539 ./dev-python/boto/boto-2.49.0-r4.ebuild
 2206011110 ./dev-python/boto3/boto3-9999.ebuild
-2206250840 ./dev-python/boto3/boto3-1.24.17.ebuild
-2206292140 ./dev-python/boto3/boto3-1.24.12.ebuild
-2206300740 ./dev-python/boto3/boto3-1.24.20.ebuild
-2207011010 ./dev-python/boto3/boto3-1.24.21.ebuild
 2207020810 ./dev-python/boto3/boto3-1.24.22.ebuild
-2207060840 ./dev-python/boto3/boto3-1.24.23.ebuild
-2207071310 ./dev-python/boto3/boto3-1.24.24.ebuild
-2207081110 ./dev-python/boto3/boto3-1.24.25.ebuild
-2206250840 ./dev-python/botocore/botocore-1.27.17.ebuild
-2206292140 ./dev-python/botocore/botocore-1.27.12.ebuild
-2206300740 ./dev-python/botocore/botocore-1.27.20.ebuild
-2207011010 ./dev-python/botocore/botocore-1.27.21.ebuild
+2207091440 ./dev-python/boto3/boto3-1.24.17.ebuild
+2207091210 ./dev-python/boto3/boto3-1.24.26.ebuild
 2206300740 ./dev-python/botocore/botocore-9999.ebuild
 2207020810 ./dev-python/botocore/botocore-1.27.22.ebuild
-2207060840 ./dev-python/botocore/botocore-1.27.23.ebuild
-2207071310 ./dev-python/botocore/botocore-1.27.24.ebuild
-2207081110 ./dev-python/botocore/botocore-1.27.25.ebuild
+2207091440 ./dev-python/botocore/botocore-1.27.17.ebuild
+2207091210 ./dev-python/botocore/botocore-1.27.26.ebuild
 2206030910 ./dev-python/bottle/bottle-0.12.21.ebuild
 2206111010 ./dev-python/bottleneck/bottleneck-1.3.4.ebuild
 2207030710 ./dev-python/bottleneck/bottleneck-1.3.5.ebuild
@@ -11322,6 +11324,7 @@
 2207011010 ./dev-python/cffi/cffi-1.15.1.ebuild
 2205301410 ./dev-python/cfgv/cfgv-3.3.1.ebuild
 2207021910 ./dev-python/cfn-lint/cfn-lint-0.61.1.ebuild
+2207091210 ./dev-python/cfn-lint/cfn-lint-0.61.2.ebuild
 2203092340 ./dev-python/cftime/cftime-1.6.0.ebuild
 2206302040 ./dev-python/cftime/cftime-1.6.1.ebuild
 2205310540 ./dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
@@ -11389,6 +11392,7 @@
 2206090610 ./dev-python/cryptography/cryptography-37.0.2-r1.ebuild
 2206261040 ./dev-python/cryptography/cryptography-37.0.3.ebuild
 2207041010 ./dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+2207091210 ./dev-python/cryptography/cryptography-37.0.4.ebuild
 2203311540 ./dev-python/css-parser/css-parser-1.0.7-r1.ebuild
 2206121510 ./dev-python/cssselect/cssselect-1.1.0-r2.ebuild
 2206221010 ./dev-python/cssselect2/cssselect2-0.6.0.ebuild
@@ -11407,6 +11411,7 @@
 2206120910 ./dev-python/dask/dask-2022.6.0.ebuild
 2206242340 ./dev-python/dask/dask-2022.6.1.ebuild
 2206271040 ./dev-python/dask/dask-2022.05.2.ebuild
+2207091210 ./dev-python/dask/dask-2022.7.0.ebuild
 2108082339 ./dev-python/dbfread/dbfread-2.0.7.ebuild
 2206171140 ./dev-python/dbfread/dbfread-2.0.7-r1.ebuild
 2205241940 ./dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -11473,11 +11478,14 @@
 2206222210 ./dev-python/docopt/docopt-0.6.2-r5.ebuild
 2202271539 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
 2106041309 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
+2207081940 ./dev-python/docutils-glep/docutils-glep-1.3.ebuild
+2207091340 ./dev-python/docutils-glep/docutils-glep-1.4.ebuild
 2206161210 ./dev-python/docutils/docutils-0.17.1-r1.ebuild
 2206161310 ./dev-python/docutils/docutils-0.18.1-r1.ebuild
 2206010440 ./dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
 2206110840 ./dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
 2207060840 ./dev-python/dogpile-cache/dogpile-cache-1.1.7.ebuild
+2207091210 ./dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
 2203281240 ./dev-python/doit-py/doit-py-0.5.0.ebuild
 2205151140 ./dev-python/doit/doit-0.36.0.ebuild
 2105091439 ./dev-python/dominate/dominate-2.6.0.ebuild
@@ -11490,6 +11498,7 @@
 2201200939 ./dev-python/easy-thumbnails/easy-thumbnails-2.8.1.ebuild
 2207031410 ./dev-python/easyprocess/easyprocess-1.1-r1.ebuild
 2205181740 ./dev-python/ecdsa/ecdsa-0.17.0.ebuild
+2207101440 ./dev-python/ecdsa/ecdsa-0.18.0.ebuild
 2110220239 ./dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
 2106051639 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
 2111052039 ./dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
@@ -11673,6 +11682,8 @@
 2207032240 ./dev-python/hypothesis/hypothesis-6.48.3.ebuild
 2207050940 ./dev-python/hypothesis/hypothesis-6.49.0.ebuild
 2207052310 ./dev-python/hypothesis/hypothesis-6.49.1.ebuild
+2207091210 ./dev-python/hypothesis/hypothesis-6.50.0.ebuild
+2207092110 ./dev-python/hypothesis/hypothesis-6.50.1.ebuild
 2112210709 ./dev-python/icalendar/icalendar-4.0.9.ebuild
 2205311040 ./dev-python/identify/identify-2.5.1.ebuild
 2206121510 ./dev-python/idna/idna-3.3-r1.ebuild
@@ -11684,6 +11695,7 @@
 2207020810 ./dev-python/imagesize/imagesize-1.4.1.ebuild
 2106032239 ./dev-python/imapclient/imapclient-2.2.0.ebuild
 2206210910 ./dev-python/imapclient/imapclient-2.2.0-r1.ebuild
+2207090810 ./dev-python/imapclient/imapclient-2.3.1.ebuild
 2203302210 ./dev-python/iminuit/iminuit-2.11.2.ebuild
 2206212040 ./dev-python/iminuit/iminuit-2.12.0.ebuild
 2207020810 ./dev-python/iminuit/iminuit-2.12.1.ebuild
@@ -11696,6 +11708,7 @@
 2205131240 ./dev-python/incremental/incremental-21.3.0-r1.ebuild
 2206122140 ./dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
 2205212110 ./dev-python/inflect/inflect-5.6.0.ebuild
+2207092110 ./dev-python/inflect/inflect-5.6.1.ebuild
 2205251410 ./dev-python/inflection/inflection-0.5.1-r1.ebuild
 2108242039 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2206100640 ./dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -11713,9 +11726,9 @@
 2206071015 ./dev-python/ipykernel/ipykernel-6.13.1.ebuild
 2206140740 ./dev-python/ipykernel/ipykernel-6.14.0.ebuild
 2206160940 ./dev-python/ipykernel/ipykernel-6.15.0.ebuild
-2204262210 ./dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
+2207091210 ./dev-python/ipykernel/ipykernel-6.15.1.ebuild
 2206281240 ./dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
-2207060910 ./dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
+2207091340 ./dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
 2206101610 ./dev-python/ipython/ipython-8.4.0.ebuild
 2206140910 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
@@ -11785,6 +11798,7 @@
 2206222010 ./dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
 2205212110 ./dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
 2207072240 ./dev-python/jupyter_core/jupyter_core-4.11.0.ebuild
+2207091210 ./dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
 2207021510 ./dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
 2206080840 ./dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
 2206232240 ./dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
@@ -11795,10 +11809,12 @@
 2206101740 ./dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
 2205151210 ./dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
 2206101740 ./dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
+2207091210 ./dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild
 2206221010 ./dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
 2206161240 ./dev-python/k5test/k5test-0.10.1-r1.ebuild
 2108021009 ./dev-python/kafka-python/kafka-python-2.0.2.ebuild
 2206161240 ./dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
+2207091210 ./dev-python/kaitaistruct/kaitaistruct-0.10.ebuild
 2206251210 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
 2205190610 ./dev-python/kazoo/kazoo-2.8.0.ebuild
 2205131710 ./dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
@@ -11996,6 +12012,7 @@
 2205220940 ./dev-python/numpy/numpy-1.22.3.ebuild
 2205231140 ./dev-python/numpy/numpy-1.22.4.ebuild
 2206231040 ./dev-python/numpy/numpy-1.23.0.ebuild
+2207090710 ./dev-python/numpy/numpy-1.23.1.ebuild
 2205271240 ./dev-python/numpydoc/numpydoc-1.3.1.ebuild
 2206101140 ./dev-python/numpydoc/numpydoc-1.4.0.ebuild
 2203312110 ./dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
@@ -12080,7 +12097,7 @@
 2110041739 ./dev-python/pgzero/pgzero-1.2.1-r1.ebuild
 2206100640 ./dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
 2206110940 ./dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
-2207020810 ./dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
+2207091410 ./dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
 2108230939 ./dev-python/phply/phply-1.2.5.ebuild
 2110152039 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
 2205161810 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -12190,6 +12207,7 @@
 2108011139 ./dev-python/pycdio/pycdio-2.1.1.ebuild
 2105181239 ./dev-python/pychm/pychm-0.8.6.ebuild
 2205200540 ./dev-python/pychromecast/pychromecast-9.3.1.ebuild
+2207090440 ./dev-python/pychromecast/pychromecast-12.1.4.ebuild
 2205192140 ./dev-python/pychroot/pychroot-0.10.4.ebuild
 2205192140 ./dev-python/pychroot/pychroot-9999.ebuild
 2205141040 ./dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
@@ -12560,6 +12578,7 @@
 2206290910 ./dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
 2206221640 ./dev-python/reflink/reflink-0.2.1-r3.ebuild
 2207061940 ./dev-python/regex/regex-2022.6.2.ebuild
+2207091210 ./dev-python/regex/regex-2022.7.9.ebuild
 2206290940 ./dev-python/rencode/rencode-1.0.6-r3.ebuild
 2205281910 ./dev-python/reno/reno-3.5.0.ebuild
 2203121309 ./dev-python/reportlab/reportlab-3.6.6.ebuild
@@ -12723,9 +12742,7 @@
 2207021510 ./dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
 2204151910 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
 2205220511 ./dev-python/sphinx/sphinx-4.5.0-r1.ebuild
-2205301210 ./dev-python/sphinx/sphinx-5.0.0.ebuild
-2206030910 ./dev-python/sphinx/sphinx-5.0.1.ebuild
-2206170310 ./dev-python/sphinx/sphinx-5.0.2.ebuild
+2207092140 ./dev-python/sphinx/sphinx-5.0.2.ebuild
 2201271210 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
 2203270340 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.8.0.ebuild
 2205221910 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
@@ -12758,6 +12775,7 @@
 2206011410 ./dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
 2201282210 ./dev-python/spur/spur-0.3.22.ebuild
 2206110810 ./dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
+2207091210 ./dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild
 2203311740 ./dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
 2201202239 ./dev-python/spyder-unittest/spyder-unittest-0.5.0.ebuild
 2206011510 ./dev-python/spyder/spyder-5.3.1-r1.ebuild
@@ -12836,6 +12854,7 @@
 2207052240 ./dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
 2106071009 ./dev-python/tld/tld-0.12.6.ebuild
 2206090710 ./dev-python/tldextract/tldextract-3.3.0.ebuild
+2207091210 ./dev-python/tldextract/tldextract-3.3.1.ebuild
 2206100640 ./dev-python/toml/toml-0.10.2-r1.ebuild
 2205102140 ./dev-python/tomli-w/tomli-w-1.0.0-r1.ebuild
 2202041239 ./dev-python/tomli/tomli-1.2.3.ebuild
@@ -12844,6 +12863,7 @@
 2206241210 ./dev-python/tomlkit/tomlkit-0.11.0.ebuild
 2207071140 ./dev-python/tomlkit/tomlkit-0.11.1.ebuild
 2206171440 ./dev-python/toolz/toolz-0.11.2-r1.ebuild
+2207101440 ./dev-python/toolz/toolz-0.12.0.ebuild
 2205162210 ./dev-python/toposort/toposort-1.7-r1.ebuild
 2206011040 ./dev-python/towncrier/towncrier-21.9.0.ebuild
 2205151410 ./dev-python/tox/tox-3.25.0.ebuild
@@ -13042,9 +13062,8 @@
 2206160940 ./dev-python/stack_data/stack_data-0.3.0.ebuild
 2205271240 ./dev-python/installer/installer-0.5.1.ebuild
 2206081111 ./dev-python/installer/installer-0.5.1-r1.ebuild
-2206250010 ./dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
-2206252010 ./dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
 2207032240 ./dev-python/pdm-pep517/pdm-pep517-1.0.1.ebuild
+2207101440 ./dev-python/pdm-pep517/pdm-pep517-1.0.2.ebuild
 2205121710 ./dev-python/poetry-core/poetry-core-1.0.8.ebuild
 2205150940 ./dev-python/socksio/socksio-1.0.0.ebuild
 2202271539 ./dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
@@ -13122,6 +13141,7 @@
 2206302140 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
 2207072240 ./dev-python/flit_scm/flit_scm-1.7.0.ebuild
 2206261040 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
+2207091210 ./dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
 2206241510 ./dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
 2206121110 ./dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
 2206242140 ./dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
@@ -13179,6 +13199,12 @@
 2207021940 ./dev-python/shapely/shapely-1.7.1-r1.ebuild
 2207021940 ./dev-python/shapely/shapely-1.8.2.ebuild
 2207070940 ./dev-python/pygccxml/pygccxml-2.2.1.ebuild
+2207091140 ./dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
+2207091140 ./dev-python/frozendict/frozendict-2.3.2.ebuild
+2207091140 ./dev-python/matrix-common/matrix-common-1.2.1.ebuild
+2207091140 ./dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
+2207091340 ./dev-python/signedjson/signedjson-1.1.4.ebuild
+2207091140 ./dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
 2207042110 ./dev-qt/assistant/assistant-5.15.5.ebuild
 2207042110 ./dev-qt/designer/designer-5.15.5.ebuild
 2207042110 ./dev-qt/linguist-tools/linguist-tools-5.15.5.ebuild
@@ -14825,6 +14851,7 @@
 2206240540 ./dev-ruby/hocon/hocon-1.3.1-r1.ebuild
 2108030109 ./dev-ruby/hoe/hoe-3.21.0.ebuild
 2205270910 ./dev-ruby/hoe/hoe-3.23.1.ebuild
+2207090840 ./dev-ruby/hoe/hoe-3.24.0.ebuild
 2203070710 ./dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
 2204080839 ./dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
 2204231109 ./dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
@@ -15188,9 +15215,8 @@
 2204231109 ./dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
 2109081939 ./dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
 2204261810 ./dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
-2101062139 ./dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
 2206241310 ./dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
-2008221109 ./dev-ruby/redis/redis-4.1.4.ebuild
+2207101240 ./dev-ruby/redis/redis-4.7.1.ebuild
 2204231109 ./dev-ruby/ref/ref-2.0.0-r1.ebuild
 2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
 2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
@@ -15677,6 +15703,7 @@
 2207020710 ./dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
 2206271010 ./dev-tcltk/blt/blt-2.5.3-r1.ebuild
 2109152309 ./dev-tcltk/bwidget/bwidget-1.9.14.ebuild
+2207100010 ./dev-tcltk/bwidget/bwidget-1.9.15.ebuild
 2005292239 ./dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
 2204230009 ./dev-tcltk/expect/expect-5.45.4-r2.ebuild
 2206202240 ./dev-tcltk/expect/expect-5.45.4-r3.ebuild
@@ -15888,8 +15915,8 @@
 2205302240 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
 2205302240 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
 2205302240 ./dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
-2205310440 ./dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
 2205302240 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+2207092340 ./dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
 2205302240 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
 2205302240 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
 2205302240 ./dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
@@ -15973,6 +16000,7 @@
 2206080040 ./dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild
 2206252010 ./dev-util/cookiecutter/cookiecutter-2.1.1.ebuild
 2202151939 ./dev-util/cppcheck/cppcheck-2.6.3.ebuild
+2207091310 ./dev-util/cppcheck/cppcheck-2.8.1.ebuild
 2001272009 ./dev-util/cppi/cppi-1.18.ebuild
 2008292209 ./dev-util/cpptest/cpptest-2.0.0-r1.ebuild
 2205190840 ./dev-util/cppunit/cppunit-1.15.1-r3.ebuild
@@ -16139,7 +16167,7 @@
 2108261609 ./dev-util/hip/hip-4.3.0.ebuild
 2201241810 ./dev-util/hip/hip-4.3.0-r1.ebuild
 2203060009 ./dev-util/hip/hip-4.3.0-r2.ebuild
-2206221610 ./dev-util/hip/hip-5.0.2-r2.ebuild
+2207082110 ./dev-util/hip/hip-5.0.2-r2.ebuild
 2206241140 ./dev-util/howdoi/howdoi-2.0.19.ebuild
 2002230040 ./dev-util/huc/huc-0.1-r1.ebuild
 2104161439 ./dev-util/hxd/hxd-0.70.02-r2.ebuild
@@ -16226,7 +16254,6 @@
 1712280139 ./dev-util/makeheaders/makeheaders-0_p4.ebuild
 2104042139 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 2105161410 ./dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
-2206281115 ./dev-util/maturin/maturin-0.12.17.ebuild
 2207061210 ./dev-util/maturin/maturin-0.12.20.ebuild
 2205150040 ./dev-util/mdds/mdds-9999.ebuild
 2206141640 ./dev-util/mdds/mdds-2.0.3.ebuild
@@ -16329,11 +16356,13 @@
 2204291110 ./dev-util/re2c/re2c-2.2.ebuild
 2202081410 ./dev-util/rebar-bin/rebar-bin-3.18.0.ebuild
 2006212039 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
-2205231510 ./dev-util/rebar/rebar-3.18.0.ebuild
+2207091040 ./dev-util/rebar/rebar-3.18.0-r1.ebuild
+2207091040 ./dev-util/rebar/rebar-3.19.0.ebuild
 2206230840 ./dev-util/redo/redo-0.42d.ebuild
 2206201810 ./dev-util/regexxer/regexxer-0.10-r2.ebuild
 1911102139 ./dev-util/rej/rej-0.16-r1.ebuild
 2207042310 ./dev-util/rizin/rizin-0.4.0.ebuild
+2207082210 ./dev-util/rizin/rizin-0.4.0-r1.ebuild
 2111062009 ./dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
 2206111710 ./dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild
 2012052309 ./dev-util/rocm-cmake/rocm-cmake-3.10.0.ebuild
@@ -16493,6 +16522,7 @@
 1912270509 ./dev-util/wasmer/wasmer-0.11.0.ebuild
 2204160640 ./dev-util/watchman/watchman-2022.04.11.00.ebuild
 2205161610 ./dev-util/watchman/watchman-2022.03.28.00.ebuild
+2207090740 ./dev-util/watchman/watchman-2022.07.04.00.ebuild
 2205090610 ./dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
 2207040140 ./dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
 2207040140 ./dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -16528,8 +16558,9 @@
 2206281240 ./dev-util/gef/gef-9999.ebuild
 2201280840 ./dev-util/ropper/ropper-9999.ebuild
 2204050639 ./dev-util/ropper/ropper-1.13.7.ebuild
-2203131239 ./dev-util/unicorn/unicorn-9999.ebuild
 2205160840 ./dev-util/unicorn/unicorn-2.0.0_rc7.ebuild
+2207091340 ./dev-util/unicorn/unicorn-2.0.0.ebuild
+2207091340 ./dev-util/unicorn/unicorn-9999.ebuild
 2205161340 ./dev-util/cdecl/cdecl-11.14.ebuild
 2207011140 ./dev-util/cdecl/cdecl-11.15.ebuild
 2202181610 ./dev-util/FlameGraph/FlameGraph-1.0.ebuild
@@ -16537,7 +16568,7 @@
 2203012109 ./dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
 2204181240 ./dev-util/tree-sitter-cli/tree-sitter-cli-0.20.6.ebuild
 2203270640 ./dev-util/Tensile/Tensile-4.3.0-r1.ebuild
-2203270640 ./dev-util/Tensile/Tensile-5.0.2.ebuild
+2207082040 ./dev-util/Tensile/Tensile-5.0.2-r1.ebuild
 2206220240 ./dev-util/gitlab-runner/gitlab-runner-14.10.1-r1.ebuild
 2206220240 ./dev-util/gitlab-runner/gitlab-runner-15.0.0-r1.ebuild
 2206220240 ./dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild
@@ -17428,8 +17459,7 @@
 2106302209 ./games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild
 2108230739 ./games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
 1702282250 ./games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild
-2204012010 ./games-server/minecraft-server/minecraft-server-1.18.2.ebuild
-2206072340 ./games-server/minecraft-server/minecraft-server-1.19.ebuild
+2207100040 ./games-server/minecraft-server/minecraft-server-1.19.ebuild
 2104161439 ./games-server/monopd/monopd-0.10.2-r1.ebuild
 2104180939 ./games-server/mtavc/mtavc-0.5-r2.ebuild
 2104100113 ./games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
@@ -17454,8 +17484,9 @@
 2108040539 ./games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
 2108021239 ./games-simulation/lincity/lincity-1.13.1-r2.ebuild
 2104250109 ./games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
-2204272340 ./games-simulation/openrct2/openrct2-9999.ebuild
 2205280140 ./games-simulation/openrct2/openrct2-0.4.0.ebuild
+2207100040 ./games-simulation/openrct2/openrct2-0.4.1.ebuild
+2207100040 ./games-simulation/openrct2/openrct2-9999.ebuild
 2204130011 ./games-simulation/openttd/openttd-12.2-r1.ebuild
 2106190039 ./games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
 2108190409 ./games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
@@ -17898,6 +17929,7 @@
 2207032210 ./gui-libs/gtk/gtk-4.6.6.ebuild
 2207060440 ./gui-libs/gtk/gtk-4.6.5.ebuild
 2205280910 ./gui-libs/libhandy/libhandy-1.6.2.ebuild
+2207100310 ./gui-libs/libhandy/libhandy-1.6.3.ebuild
 2201181539 ./gui-libs/libwpe/libwpe-1.12.0.ebuild
 2107210539 ./gui-libs/neatvnc/neatvnc-0.4.0.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-9999.ebuild
@@ -17922,12 +17954,14 @@
 2202140409 ./gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
 2205280910 ./gui-libs/libadwaita/libadwaita-1.1.1.ebuild
 2207060440 ./gui-libs/libadwaita/libadwaita-1.1.2.ebuild
+2207100310 ./gui-libs/libadwaita/libadwaita-1.1.3.ebuild
 2205280910 ./gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
 2207060440 ./gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
 2205251440 ./gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-0.2.0.ebuild
 2201140910 ./gui-wm/hikari/hikari-2.3.3.ebuild
 2205260910 ./gui-wm/sway/sway-1.7.ebuild
-2205260910 ./gui-wm/sway/sway-9999.ebuild
+2207081840 ./gui-wm/sway/sway-1.7-r1.ebuild
+2207081840 ./gui-wm/sway/sway-9999.ebuild
 2111101109 ./gui-wm/wayfire/wayfire-0.7.2.ebuild
 2111101109 ./gui-wm/wayfire/wayfire-9999.ebuild
 2205092240 ./java-virtuals/servlet-api/servlet-api-2.3-r1.ebuild
@@ -18017,7 +18051,7 @@
 2204222140 ./kde-apps/kajongg/kajongg-21.12.3.ebuild
 2207071410 ./kde-apps/kajongg/kajongg-22.04.3.ebuild
 2204222140 ./kde-apps/kalarm/kalarm-21.12.3.ebuild
-2207071410 ./kde-apps/kalarm/kalarm-22.04.3.ebuild
+2207081610 ./kde-apps/kalarm/kalarm-22.04.3.ebuild
 2204222140 ./kde-apps/kalarmcal/kalarmcal-21.12.3.ebuild
 2204222140 ./kde-apps/kalgebra/kalgebra-21.12.3.ebuild
 2207071410 ./kde-apps/kalgebra/kalgebra-22.04.3.ebuild
@@ -18385,165 +18419,245 @@
 2207071410 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-22.04.3.ebuild
 2204290652 ./kde-frameworks/attica/attica-5.92.0.ebuild
 2206280740 ./kde-frameworks/attica/attica-5.95.0.ebuild
+2207091740 ./kde-frameworks/attica/attica-5.96.0.ebuild
 2204290652 ./kde-frameworks/baloo/baloo-5.92.0.ebuild
 2206291040 ./kde-frameworks/baloo/baloo-5.95.0.ebuild
+2207091740 ./kde-frameworks/baloo/baloo-5.96.0.ebuild
 2204290652 ./kde-frameworks/bluez-qt/bluez-qt-5.92.0.ebuild
 2206291040 ./kde-frameworks/bluez-qt/bluez-qt-5.95.0-r1.ebuild
+2207091740 ./kde-frameworks/bluez-qt/bluez-qt-5.96.0.ebuild
 2204290652 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.92.0.ebuild
 2206122310 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.95.0.ebuild
+2207091740 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.96.0.ebuild
 2204290652 ./kde-frameworks/breeze-icons/breeze-icons-5.92.0.ebuild
 2206280740 ./kde-frameworks/breeze-icons/breeze-icons-5.95.0.ebuild
+2207091740 ./kde-frameworks/breeze-icons/breeze-icons-5.96.0.ebuild
 2204290740 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild
 2206122310 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.95.0.ebuild
+2207091740 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
 2204290652 ./kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
 2206291040 ./kde-frameworks/frameworkintegration/frameworkintegration-5.95.0.ebuild
+2207091740 ./kde-frameworks/frameworkintegration/frameworkintegration-5.96.0.ebuild
 2204290652 ./kde-frameworks/kactivities-stats/kactivities-stats-5.92.0.ebuild
 2206291040 ./kde-frameworks/kactivities-stats/kactivities-stats-5.95.0.ebuild
+2207091740 ./kde-frameworks/kactivities-stats/kactivities-stats-5.96.0.ebuild
 2204290652 ./kde-frameworks/kactivities/kactivities-5.92.0.ebuild
 2206291040 ./kde-frameworks/kactivities/kactivities-5.95.0.ebuild
+2207091740 ./kde-frameworks/kactivities/kactivities-5.96.0.ebuild
 2204290652 ./kde-frameworks/kapidox/kapidox-5.92.0.ebuild
 2206122310 ./kde-frameworks/kapidox/kapidox-5.95.0.ebuild
+2207091740 ./kde-frameworks/kapidox/kapidox-5.96.0.ebuild
 2204290652 ./kde-frameworks/karchive/karchive-5.92.0.ebuild
 2206280740 ./kde-frameworks/karchive/karchive-5.95.0.ebuild
+2207091740 ./kde-frameworks/karchive/karchive-5.96.0.ebuild
 2204290652 ./kde-frameworks/kauth/kauth-5.92.0.ebuild
 2206291040 ./kde-frameworks/kauth/kauth-5.95.0.ebuild
+2207091740 ./kde-frameworks/kauth/kauth-5.96.0.ebuild
 2204290652 ./kde-frameworks/kbookmarks/kbookmarks-5.92.0.ebuild
 2206291040 ./kde-frameworks/kbookmarks/kbookmarks-5.95.0.ebuild
+2207091740 ./kde-frameworks/kbookmarks/kbookmarks-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcalendarcore/kcalendarcore-5.92.0.ebuild
 2206122310 ./kde-frameworks/kcalendarcore/kcalendarcore-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcalendarcore/kcalendarcore-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/kcmutils/kcmutils-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcmutils/kcmutils-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcodecs/kcodecs-5.92.0.ebuild
 2206291040 ./kde-frameworks/kcodecs/kcodecs-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcodecs/kcodecs-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcompletion/kcompletion-5.92.0.ebuild
 2206291040 ./kde-frameworks/kcompletion/kcompletion-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcompletion/kcompletion-5.96.0.ebuild
 2204290652 ./kde-frameworks/kconfig/kconfig-5.92.0.ebuild
 2206291040 ./kde-frameworks/kconfig/kconfig-5.95.0.ebuild
+2207091740 ./kde-frameworks/kconfig/kconfig-5.96.0.ebuild
 2204290652 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.95.0.ebuild
+2207091740 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcontacts/kcontacts-5.92.0.ebuild
 2206122310 ./kde-frameworks/kcontacts/kcontacts-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcontacts/kcontacts-5.96.0.ebuild
 2204290652 ./kde-frameworks/kcoreaddons/kcoreaddons-5.92.0.ebuild
 2206122310 ./kde-frameworks/kcoreaddons/kcoreaddons-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcoreaddons/kcoreaddons-5.96.0.ebuild
 2206081840 ./kde-frameworks/kcrash/kcrash-5.92.0.ebuild
 2206291040 ./kde-frameworks/kcrash/kcrash-5.95.0.ebuild
+2207091740 ./kde-frameworks/kcrash/kcrash-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdav/kdav-5.92.0.ebuild
 2206122310 ./kde-frameworks/kdav/kdav-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdav/kdav-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdbusaddons/kdbusaddons-5.92.0.ebuild
 2206291040 ./kde-frameworks/kdbusaddons/kdbusaddons-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdbusaddons/kdbusaddons-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild
 2206292310 ./kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
+2207091740 ./kde-frameworks/kdeclarative/kdeclarative-5.96.0.ebuild
 2204290652 ./kde-frameworks/kded/kded-5.92.0.ebuild
 2206291040 ./kde-frameworks/kded/kded-5.95.0.ebuild
+2207091740 ./kde-frameworks/kded/kded-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdelibs4support/kdelibs4support-5.92.0.ebuild
 2206291040 ./kde-frameworks/kdelibs4support/kdelibs4support-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdesu/kdesu-5.92.0.ebuild
 2206122310 ./kde-frameworks/kdesu/kdesu-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdesu/kdesu-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdnssd/kdnssd-5.92.0.ebuild
 2206291040 ./kde-frameworks/kdnssd/kdnssd-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdnssd/kdnssd-5.96.0.ebuild
 2204290652 ./kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
 2206291040 ./kde-frameworks/kdoctools/kdoctools-5.95.0.ebuild
+2207091740 ./kde-frameworks/kdoctools/kdoctools-5.96.0.ebuild
 2204290652 ./kde-frameworks/kemoticons/kemoticons-5.92.0.ebuild
 2206291040 ./kde-frameworks/kemoticons/kemoticons-5.95.0.ebuild
+2207091740 ./kde-frameworks/kemoticons/kemoticons-5.96.0.ebuild
 2205251440 ./kde-frameworks/kf-env/kf-env-5.ebuild
 2204290652 ./kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
 2206291040 ./kde-frameworks/kfilemetadata/kfilemetadata-5.95.0.ebuild
+2207091740 ./kde-frameworks/kfilemetadata/kfilemetadata-5.96.0.ebuild
 2204290652 ./kde-frameworks/kglobalaccel/kglobalaccel-5.92.0.ebuild
 2206292310 ./kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild
+2207091740 ./kde-frameworks/kglobalaccel/kglobalaccel-5.96.0.ebuild
 2204290652 ./kde-frameworks/kguiaddons/kguiaddons-5.92.0.ebuild
 2206291040 ./kde-frameworks/kguiaddons/kguiaddons-5.95.0.ebuild
+2207091740 ./kde-frameworks/kguiaddons/kguiaddons-5.96.0.ebuild
 2204290652 ./kde-frameworks/kholidays/kholidays-5.92.0.ebuild
 2206291040 ./kde-frameworks/kholidays/kholidays-5.95.0.ebuild
+2207091740 ./kde-frameworks/kholidays/kholidays-5.96.0.ebuild
 2204290652 ./kde-frameworks/khtml/khtml-5.92.0.ebuild
 2206291040 ./kde-frameworks/khtml/khtml-5.95.0.ebuild
+2207091740 ./kde-frameworks/khtml/khtml-5.96.0.ebuild
 2204290652 ./kde-frameworks/ki18n/ki18n-5.92.0.ebuild
 2206291040 ./kde-frameworks/ki18n/ki18n-5.95.0.ebuild
+2207091740 ./kde-frameworks/ki18n/ki18n-5.96.0.ebuild
 2204290652 ./kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
 2206291040 ./kde-frameworks/kiconthemes/kiconthemes-5.95.0.ebuild
+2207091740 ./kde-frameworks/kiconthemes/kiconthemes-5.96.0.ebuild
 2204290652 ./kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/kidletime/kidletime-5.95.0.ebuild
+2207091740 ./kde-frameworks/kidletime/kidletime-5.96.0.ebuild
 2204290652 ./kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
 2206122310 ./kde-frameworks/kimageformats/kimageformats-5.95.0.ebuild
+2207091740 ./kde-frameworks/kimageformats/kimageformats-5.96.0.ebuild
 2204290652 ./kde-frameworks/kinit/kinit-5.92.0.ebuild
 2206291040 ./kde-frameworks/kinit/kinit-5.95.0.ebuild
+2207091740 ./kde-frameworks/kinit/kinit-5.96.0.ebuild
 2204290652 ./kde-frameworks/kio/kio-5.92.0.ebuild
 2206292310 ./kde-frameworks/kio/kio-5.95.0-r1.ebuild
+2207091740 ./kde-frameworks/kio/kio-5.96.0.ebuild
 2204290652 ./kde-frameworks/kirigami/kirigami-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/kirigami/kirigami-5.95.0.ebuild
+2207091740 ./kde-frameworks/kirigami/kirigami-5.96.0.ebuild
 2204290652 ./kde-frameworks/kitemmodels/kitemmodels-5.92.0.ebuild
 2206291040 ./kde-frameworks/kitemmodels/kitemmodels-5.95.0.ebuild
+2207091740 ./kde-frameworks/kitemmodels/kitemmodels-5.96.0.ebuild
 2204290652 ./kde-frameworks/kitemviews/kitemviews-5.92.0.ebuild
 2206291040 ./kde-frameworks/kitemviews/kitemviews-5.95.0.ebuild
+2207091740 ./kde-frameworks/kitemviews/kitemviews-5.96.0.ebuild
 2204290652 ./kde-frameworks/kjobwidgets/kjobwidgets-5.92.0.ebuild
 2206291040 ./kde-frameworks/kjobwidgets/kjobwidgets-5.95.0.ebuild
+2207091740 ./kde-frameworks/kjobwidgets/kjobwidgets-5.96.0.ebuild
 2204290652 ./kde-frameworks/kjs/kjs-5.92.0.ebuild
 2206291040 ./kde-frameworks/kjs/kjs-5.95.0.ebuild
+2207091740 ./kde-frameworks/kjs/kjs-5.96.0.ebuild
 2204290652 ./kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
 2206291040 ./kde-frameworks/knewstuff/knewstuff-5.95.0.ebuild
+2207091740 ./kde-frameworks/knewstuff/knewstuff-5.96.0.ebuild
 2204290652 ./kde-frameworks/knotifications/knotifications-5.92.0.ebuild
 2206291040 ./kde-frameworks/knotifications/knotifications-5.95.0.ebuild
+2207091740 ./kde-frameworks/knotifications/knotifications-5.96.0.ebuild
 2204290652 ./kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild
 2206291040 ./kde-frameworks/knotifyconfig/knotifyconfig-5.95.0.ebuild
+2207091740 ./kde-frameworks/knotifyconfig/knotifyconfig-5.96.0.ebuild
 2204290652 ./kde-frameworks/kpackage/kpackage-5.92.0.ebuild
 2206291040 ./kde-frameworks/kpackage/kpackage-5.95.0.ebuild
+2207091740 ./kde-frameworks/kpackage/kpackage-5.96.0.ebuild
 2204290652 ./kde-frameworks/kparts/kparts-5.92.0.ebuild
 2206291040 ./kde-frameworks/kparts/kparts-5.95.0.ebuild
+2207091740 ./kde-frameworks/kparts/kparts-5.96.0.ebuild
 2204290652 ./kde-frameworks/kpeople/kpeople-5.92.0.ebuild
 2206291040 ./kde-frameworks/kpeople/kpeople-5.95.0.ebuild
+2207091740 ./kde-frameworks/kpeople/kpeople-5.96.0.ebuild
 2204290652 ./kde-frameworks/kplotting/kplotting-5.92.0.ebuild
 2206122310 ./kde-frameworks/kplotting/kplotting-5.95.0.ebuild
+2207091740 ./kde-frameworks/kplotting/kplotting-5.96.0.ebuild
 2204290652 ./kde-frameworks/kpty/kpty-5.92.0.ebuild
 2206291040 ./kde-frameworks/kpty/kpty-5.95.0.ebuild
+2207091740 ./kde-frameworks/kpty/kpty-5.96.0.ebuild
 2204290652 ./kde-frameworks/kquickcharts/kquickcharts-5.92.0.ebuild
 2206291040 ./kde-frameworks/kquickcharts/kquickcharts-5.95.0.ebuild
+2207091740 ./kde-frameworks/kquickcharts/kquickcharts-5.96.0.ebuild
 2204290652 ./kde-frameworks/kross/kross-5.92.0.ebuild
 2206122310 ./kde-frameworks/kross/kross-5.95.0.ebuild
+2207091740 ./kde-frameworks/kross/kross-5.96.0.ebuild
 2204290652 ./kde-frameworks/krunner/krunner-5.92.0.ebuild
 2206291040 ./kde-frameworks/krunner/krunner-5.95.0.ebuild
+2207091740 ./kde-frameworks/krunner/krunner-5.96.0.ebuild
 2204290652 ./kde-frameworks/kservice/kservice-5.92.0.ebuild
 2206291040 ./kde-frameworks/kservice/kservice-5.95.0.ebuild
+2207091740 ./kde-frameworks/kservice/kservice-5.96.0.ebuild
 2204290652 ./kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/ktexteditor/ktexteditor-5.95.0.ebuild
+2207091740 ./kde-frameworks/ktexteditor/ktexteditor-5.96.0.ebuild
 2204290652 ./kde-frameworks/ktextwidgets/ktextwidgets-5.92.0.ebuild
 2206291040 ./kde-frameworks/ktextwidgets/ktextwidgets-5.95.0.ebuild
+2207091740 ./kde-frameworks/ktextwidgets/ktextwidgets-5.96.0.ebuild
 2204290652 ./kde-frameworks/kunitconversion/kunitconversion-5.92.0.ebuild
 2206291040 ./kde-frameworks/kunitconversion/kunitconversion-5.95.0.ebuild
+2207091740 ./kde-frameworks/kunitconversion/kunitconversion-5.96.0.ebuild
 2204290652 ./kde-frameworks/kwallet/kwallet-5.92.0.ebuild
 2206291040 ./kde-frameworks/kwallet/kwallet-5.95.0.ebuild
+2207091740 ./kde-frameworks/kwallet/kwallet-5.96.0.ebuild
 2204290652 ./kde-frameworks/kwayland/kwayland-5.92.0.ebuild
 2206122310 ./kde-frameworks/kwayland/kwayland-5.95.0.ebuild
+2207091740 ./kde-frameworks/kwayland/kwayland-5.96.0.ebuild
 2204290652 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
 2206291040 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.95.0.ebuild
+2207091740 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.96.0.ebuild
 2204290652 ./kde-frameworks/kwindowsystem/kwindowsystem-5.92.0.ebuild
 2206122310 ./kde-frameworks/kwindowsystem/kwindowsystem-5.95.0.ebuild
+2207091740 ./kde-frameworks/kwindowsystem/kwindowsystem-5.96.0.ebuild
 2204290652 ./kde-frameworks/kxmlgui/kxmlgui-5.92.0.ebuild
 2206291040 ./kde-frameworks/kxmlgui/kxmlgui-5.95.0.ebuild
+2207091740 ./kde-frameworks/kxmlgui/kxmlgui-5.96.0.ebuild
 2204290652 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.92.0.ebuild
 2206122310 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.95.0.ebuild
+2207091740 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.96.0.ebuild
 2204290652 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.92.0.ebuild
 2206291040 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.95.0.ebuild
+2207091740 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.96.0.ebuild
 2204290652 ./kde-frameworks/oxygen-icons/oxygen-icons-5.92.0.ebuild
 2206122310 ./kde-frameworks/oxygen-icons/oxygen-icons-5.95.0.ebuild
+2207091740 ./kde-frameworks/oxygen-icons/oxygen-icons-5.96.0.ebuild
 2204290652 ./kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
 2206292310 ./kde-frameworks/plasma/plasma-5.95.0-r4.ebuild
+2207091740 ./kde-frameworks/plasma/plasma-5.96.0.ebuild
 2204290652 ./kde-frameworks/prison/prison-5.92.0.ebuild
 2206291040 ./kde-frameworks/prison/prison-5.95.0.ebuild
+2207091740 ./kde-frameworks/prison/prison-5.96.0.ebuild
 2204290652 ./kde-frameworks/purpose/purpose-5.92.0.ebuild
 2206291040 ./kde-frameworks/purpose/purpose-5.95.0.ebuild
+2207091740 ./kde-frameworks/purpose/purpose-5.96.0.ebuild
 2204290652 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
 2206291040 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.95.0.ebuild
+2207091740 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0.ebuild
 2204290652 ./kde-frameworks/solid/solid-5.92.0.ebuild
 2206122310 ./kde-frameworks/solid/solid-5.95.0.ebuild
+2207091740 ./kde-frameworks/solid/solid-5.96.0.ebuild
 2204290652 ./kde-frameworks/sonnet/sonnet-5.92.0.ebuild
 2206291040 ./kde-frameworks/sonnet/sonnet-5.95.0.ebuild
+2207091740 ./kde-frameworks/sonnet/sonnet-5.96.0.ebuild
 2204290652 ./kde-frameworks/syndication/syndication-5.92.0.ebuild
 2206122310 ./kde-frameworks/syndication/syndication-5.95.0.ebuild
+2207091740 ./kde-frameworks/syndication/syndication-5.96.0.ebuild
 2204290652 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.92.0-r1.ebuild
 2206291040 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.95.0.ebuild
+2207091740 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.96.0.ebuild
 2204290652 ./kde-frameworks/threadweaver/threadweaver-5.92.0.ebuild
 2206280740 ./kde-frameworks/threadweaver/threadweaver-5.95.0.ebuild
+2207091740 ./kde-frameworks/threadweaver/threadweaver-5.96.0.ebuild
 2204290652 ./kde-frameworks/countryflags/countryflags-5.92.0.ebuild
 2206280740 ./kde-frameworks/countryflags/countryflags-5.95.0.ebuild
+2207091740 ./kde-frameworks/countryflags/countryflags-5.96.0.ebuild
 2108211939 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
 2204222140 ./kde-misc/kdeconnect/kdeconnect-21.12.3.ebuild
@@ -19203,6 +19317,7 @@
 2206161940 ./media-gfx/blender/blender-3.1.2.ebuild
 2206160410 ./media-gfx/blender/blender-3.2.0.ebuild
 2206161940 ./media-gfx/blender/blender-9999.ebuild
+2207090910 ./media-gfx/blender/blender-3.2.1.ebuild
 2202201939 ./media-gfx/brscan4/brscan4-0.4.11.1-r1.ebuild
 2203141339 ./media-gfx/cairosvg/cairosvg-2.5.2.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -19242,6 +19357,7 @@
 2203030009 ./media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
 2203112209 ./media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
 2101181809 ./media-gfx/exif/exif-0.6.22.ebuild
+2207090140 ./media-gfx/exif/exif-0.6.22-r1.ebuild
 2111100109 ./media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
 2203200340 ./media-gfx/farbfeld/farbfeld-4.ebuild
 2203200340 ./media-gfx/farbfeld/farbfeld-9999.ebuild
@@ -19268,6 +19384,7 @@
 2207011910 ./media-gfx/fotoxx/fotoxx-22.20.ebuild
 2204141210 ./media-gfx/freecad/freecad-9999.ebuild
 2205191540 ./media-gfx/freecad/freecad-0.19.4-r1.ebuild
+2207091540 ./media-gfx/freecad/freecad-0.20.ebuild
 2203010109 ./media-gfx/freepv/freepv-0.3.0-r5.ebuild
 2206281340 ./media-gfx/frogr/frogr-1.5-r1.ebuild
 2101230739 ./media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
@@ -19284,7 +19401,7 @@
 2205150410 ./media-gfx/gimp/gimp-2.10.30.ebuild
 2205150410 ./media-gfx/gimp/gimp-2.99.10-r1.ebuild
 2205150410 ./media-gfx/gimp/gimp-9999.ebuild
-2206220210 ./media-gfx/gimp/gimp-2.10.32.ebuild
+2207091340 ./media-gfx/gimp/gimp-2.10.32.ebuild
 2205150040 ./media-gfx/gmic/gmic-3.0.1-r1.ebuild
 2102270009 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2111120512 ./media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
@@ -19379,9 +19496,9 @@
 2101130309 ./media-gfx/maim/maim-5.6.3.ebuild
 2006050139 ./media-gfx/maim/maim-9999.ebuild
 2202152309 ./media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild
-2205201540 ./media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
 2205202210 ./media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild
-2205201540 ./media-gfx/mcomix/mcomix-9999.ebuild
+2207091910 ./media-gfx/mcomix/mcomix-2.0.2.ebuild
+2207091910 ./media-gfx/mcomix/mcomix-9999.ebuild
 2106032239 ./media-gfx/meshlab/meshlab-2020.12-r1.ebuild
 1806091709 ./media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
 2205251240 ./media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -19429,7 +19546,6 @@
 2203200340 ./media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
 1912131839 ./media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
 1912131839 ./media-gfx/pngtools/pngtools-0.4-r2.ebuild
-2004282239 ./media-gfx/potrace/potrace-1.15.ebuild
 2205171610 ./media-gfx/potrace/potrace-1.16.ebuild
 2206161940 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
 2206161940 ./media-gfx/povray/povray-3.7.0.0-r2.ebuild
@@ -19452,6 +19568,7 @@
 2205150040 ./media-gfx/rawtherapee/rawtherapee-5.8.ebuild
 1911100539 ./media-gfx/recoverjpeg/recoverjpeg-2.2.3-r1.ebuild
 2203251109 ./media-gfx/ristretto/ristretto-0.12.2.ebuild
+2207100940 ./media-gfx/ristretto/ristretto-0.12.3.ebuild
 1805290208 ./media-gfx/rotoscope/rotoscope-0.2.ebuild
 2112132209 ./media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
 2203121239 ./media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -19511,8 +19628,6 @@
 2202192110 ./media-gfx/ansilove/ansilove-9999.ebuild
 2206021840 ./media-gfx/ueberzug/ueberzug-18.1.9-r1.ebuild
 2203141939 ./media-gfx/entice/entice-0_pre20210919-r1.ebuild
-2204041009 ./media-gfx/renderdoc/renderdoc-1.18-r2.ebuild
-2205212040 ./media-gfx/renderdoc/renderdoc-1.19.ebuild
 2207031210 ./media-gfx/renderdoc/renderdoc-1.20.ebuild
 2205230940 ./media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
 2207071410 ./media-gfx/skanpage/skanpage-22.04.3.ebuild
@@ -19528,12 +19643,14 @@
 2205171110 ./media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
 2206011010 ./media-libs/alsa-lib/alsa-lib-1.2.7.ebuild
 2206181840 ./media-libs/alsa-lib/alsa-lib-1.2.7.1.ebuild
+2207091140 ./media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
 2106052339 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2109230439 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
 2205171110 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
 2205171110 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
 2206011040 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.ebuild
 2206172240 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.1.ebuild
+2207101010 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
 2101070439 ./media-libs/alure/alure-1.2-r2.ebuild
 2109230909 ./media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
 2108211209 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -19545,7 +19662,7 @@
 2111160610 ./media-libs/babl/babl-0.1.88.ebuild
 2202261539 ./media-libs/babl/babl-9999.ebuild
 2205170940 ./media-libs/babl/babl-0.1.90-r1.ebuild
-2205170440 ./media-libs/babl/babl-0.1.92.ebuild
+2207091340 ./media-libs/babl/babl-0.1.92.ebuild
 2112310709 ./media-libs/bcg729/bcg729-1.1.1.ebuild
 2109230909 ./media-libs/bio2jack/bio2jack-0.9-r2.ebuild
 1802221208 ./media-libs/blib/blib-1.1.7-r2.ebuild
@@ -19557,6 +19674,7 @@
 2206211940 ./media-libs/clutter-gtk/clutter-gtk-1.8.4-r1.ebuild
 2206232340 ./media-libs/clutter/clutter-1.26.4-r1.ebuild
 2202070739 ./media-libs/codec2/codec2-1.0.3.ebuild
+2207090710 ./media-libs/codec2/codec2-1.0.4.ebuild
 2206232340 ./media-libs/cogl/cogl-1.22.8-r2.ebuild
 2112080640 ./media-libs/coin/coin-4.0.0.ebuild
 2205140710 ./media-libs/compface/compface-1.5.2.ebuild
@@ -19604,9 +19722,9 @@
 2206210240 ./media-libs/gavl/gavl-1.4.0-r2.ebuild
 2111080239 ./media-libs/gd/gd-2.3.2-r1.ebuild
 2205141340 ./media-libs/gd/gd-2.3.3-r1.ebuild
-2202261509 ./media-libs/gegl/gegl-0.4.36-r1.ebuild
 2202261539 ./media-libs/gegl/gegl-9999.ebuild
 2203010309 ./media-libs/gegl/gegl-0.4.34.ebuild
+2207091340 ./media-libs/gegl/gegl-0.4.36-r1.ebuild
 2205311240 ./media-libs/gexiv2/gexiv2-0.14.0.ebuild
 2109021209 ./media-libs/giblib/giblib-1.2.4-r1.ebuild
 2205140710 ./media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -19624,6 +19742,7 @@
 2206251740 ./media-libs/gmmlib/gmmlib-22.1.3.ebuild
 2206251740 ./media-libs/gmmlib/gmmlib-22.1.4.ebuild
 2206251740 ./media-libs/gmmlib/gmmlib-9999.ebuild
+2207100040 ./media-libs/gmmlib/gmmlib-22.1.5.ebuild
 2105311239 ./media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
 2205311240 ./media-libs/graphene/graphene-1.10.8.ebuild
 2201241810 ./media-libs/grilo/grilo-0.3.14.ebuild
@@ -19727,10 +19846,10 @@
 2205251240 ./media-libs/libde265/libde265-9999.ebuild
 2202080810 ./media-libs/libdiscid/libdiscid-0.6.2.ebuild
 2206280740 ./media-libs/libdmtx/libdmtx-0.7.5.ebuild
+2207082140 ./media-libs/libdmtx/libdmtx-0.7.7.ebuild
 2111070809 ./media-libs/libdv/libdv-1.0.0-r4.ebuild
 2110160409 ./media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
 2102261209 ./media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
-2002112051 ./media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
 2206280740 ./media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
 2207021540 ./media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild
 2108261809 ./media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
@@ -19955,6 +20074,7 @@
 2110300139 ./media-libs/oidn/oidn-1.3.0-r1.ebuild
 2110310910 ./media-libs/oidn/oidn-1.4.1-r1.ebuild
 2206071140 ./media-libs/oidn/oidn-1.4.2.ebuild
+2207090910 ./media-libs/oidn/oidn-1.4.3.ebuild
 2205251440 ./media-libs/openal/openal-1.22.0.ebuild
 2206280710 ./media-libs/openal/openal-1.22.2.ebuild
 2104180939 ./media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -19983,7 +20103,7 @@
 2205190840 ./media-libs/opus/opus-1.3.1-r3.ebuild
 2205260840 ./media-libs/opusfile/opusfile-0.12.ebuild
 2203200310 ./media-libs/osl/osl-1.12.4.1-r2.ebuild
-2205201640 ./media-libs/osl/osl-1.11.17.0-r4.ebuild
+2207090910 ./media-libs/osl/osl-1.11.17.0-r4.ebuild
 2109190639 ./media-libs/partio/partio-1.10.1.ebuild
 2204172110 ./media-libs/partio/partio-1.14.6.ebuild
 2205260840 ./media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -20598,8 +20718,7 @@
 2106172339 ./media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
 2106071109 ./media-plugins/x42-avldrums/x42-avldrums-9999.ebuild
 2202191110 ./media-plugins/x42-plugins/x42-plugins-99999999.ebuild
-2205051310 ./media-plugins/x42-plugins/x42-plugins-20220327.ebuild
-2206081040 ./media-plugins/x42-plugins/x42-plugins-20220605.ebuild
+2207090740 ./media-plugins/x42-plugins/x42-plugins-20220605.ebuild
 2010091139 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
 2108220709 ./media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
 2205280440 ./media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
@@ -20649,9 +20768,9 @@
 2107010809 ./media-sound/a2jmidid/a2jmidid-9999.ebuild
 2203081210 ./media-sound/abcde/abcde-2.9.3-r2.ebuild
 2203021209 ./media-sound/abcm2ps/abcm2ps-8.14.13.ebuild
-2206081040 ./media-sound/abcmidi/abcmidi-2022.06.07.ebuild
 2206160710 ./media-sound/abcmidi/abcmidi-2022.06.14.ebuild
 2206220940 ./media-sound/abcmidi/abcmidi-2022.05.20.ebuild
+2207090740 ./media-sound/abcmidi/abcmidi-2022.06.07.ebuild
 2206121142 ./media-sound/aeolus/aeolus-0.10.4.ebuild
 2203202209 ./media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
 2204252340 ./media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
@@ -20660,7 +20779,8 @@
 2206200440 ./media-sound/alsa-utils/alsa-utils-1.2.7-r1.ebuild
 1806121839 ./media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
 2012270139 ./media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
-2109041339 ./media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
+2207101440 ./media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
+2207101440 ./media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
 2202101310 ./media-sound/amsynth/amsynth-1.12.4.ebuild
 2206210840 ./media-sound/apetag/apetag-1.12-r3.ebuild
 2205011048 ./media-sound/apulse/apulse-0.1.13-r2.ebuild
@@ -20882,6 +21002,7 @@
 2204010840 ./media-sound/mpd/mpd-0.22.11.ebuild
 2204270740 ./media-sound/mpd/mpd-0.23.6-r1.ebuild
 2206021510 ./media-sound/mpd/mpd-0.23.7.ebuild
+2207090410 ./media-sound/mpd/mpd-0.23.8.ebuild
 2107120009 ./media-sound/mpdas/mpdas-0.4.5.ebuild
 2004121409 ./media-sound/mpdscribble/mpdscribble-0.22.ebuild
 2110100909 ./media-sound/mpdscribble/mpdscribble-0.23.ebuild
@@ -20916,8 +21037,8 @@
 2112291039 ./media-sound/orpheus/orpheus-1.6-r3.ebuild
 2107180040 ./media-sound/pamix/pamix-1.6-r2.ebuild
 2107180040 ./media-sound/pamix/pamix-9999.ebuild
-2202210410 ./media-sound/paprefs/paprefs-1.2-r1.ebuild
-2203081640 ./media-sound/pasystray/pasystray-0.8.0-r1.ebuild
+2207090640 ./media-sound/paprefs/paprefs-1.2-r2.ebuild
+2207091110 ./media-sound/pasystray/pasystray-0.8.0-r1.ebuild
 2206081210 ./media-sound/patchage/patchage-1.0.6.ebuild
 2108210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
 2204151640 ./media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
@@ -20948,16 +21069,17 @@
 2010071039 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
 2102201939 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
 2202210410 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
-2206160110 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
-2206160240 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
-2206210440 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
-2207050110 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
+2207082340 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+2207082340 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
+2207082340 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
+2207082340 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
 2112290139 ./media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
 2201012339 ./media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
 2205280440 ./media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
 2206210440 ./media-sound/pulseaudio/pulseaudio-16.0.ebuild
+2207090140 ./media-sound/pulseaudio/pulseaudio-16.1.ebuild
 2206042310 ./media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
 2201300509 ./media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
 2201300509 ./media-sound/pulsemixer/pulsemixer-9999.ebuild
@@ -20978,6 +21100,7 @@
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
 2005201639 ./media-sound/qtgain/qtgain-1.0.0.ebuild
 2205111240 ./media-sound/qtractor/qtractor-0.9.26.ebuild
+2207082310 ./media-sound/qtractor/qtractor-0.9.27.ebuild
 2005210139 ./media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
 2010131239 ./media-sound/quimup/quimup-1.4.4.ebuild
 2205052340 ./media-sound/quodlibet/quodlibet-4.5.0.ebuild
@@ -21081,6 +21204,7 @@
 2205051310 ./media-sound/wavbreaker/wavbreaker-0.15.ebuild
 2008082009 ./media-sound/wavegain/wavegain-1.3.1.ebuild
 2203100240 ./media-sound/wavpack/wavpack-5.4.0.ebuild
+2207091610 ./media-sound/wavpack/wavpack-5.5.0.ebuild
 1912110309 ./media-sound/wavplay/wavplay-2.0.ebuild
 1809221939 ./media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
 2108181109 ./media-sound/whipper/whipper-0.9.0.ebuild
@@ -21172,8 +21296,8 @@
 1912131639 ./media-video/chaplin/chaplin-1.10-r2.ebuild
 2203081540 ./media-video/cheese/cheese-41.1.ebuild
 2104161439 ./media-video/cpvts/cpvts-1.2-r1.ebuild
-2202021909 ./media-video/devedeng/devedeng-4.16.0-r2.ebuild
 2203132240 ./media-video/devedeng/devedeng-4.17.0.ebuild
+2207101710 ./media-video/devedeng/devedeng-4.17.0-r1.ebuild
 2111292209 ./media-video/dirac/dirac-1.0.2-r1.ebuild
 2205311510 ./media-video/droidcam/droidcam-1.8.2.ebuild
 2004261409 ./media-video/dv2sub/dv2sub-0.3-r1.ebuild
@@ -21246,8 +21370,8 @@
 2207062240 ./media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
 2207062240 ./media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
 2207062240 ./media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
-2207081110 ./media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
-2207081110 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+2207090110 ./media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
+2207090110 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
 2109080439 ./media-video/motion/motion-4.3.2-r1.ebuild
 2205110210 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
 2204212209 ./media-video/movit/movit-1.6.3-r1.ebuild
@@ -21261,7 +21385,7 @@
 2205140410 ./media-video/mpv/mpv-0.33.1-r3.ebuild
 2205140410 ./media-video/mpv/mpv-0.34.0-r1.ebuild
 2205171610 ./media-video/mpv/mpv-0.34.1-r1.ebuild
-2206220743 ./media-video/mpv/mpv-9999.ebuild
+2207090610 ./media-video/mpv/mpv-9999.ebuild
 2108111010 ./media-video/noad/noad-0.8.7.ebuild
 1702282250 ./media-video/nvidia-video-codec/nvidia-video-codec-7.0.1.ebuild
 1702282250 ./media-video/nvidia-video-codec/nvidia-video-codec-7.1.9.ebuild
@@ -21282,7 +21406,9 @@
 2207050310 ./media-video/pipewire/pipewire-0.3.53-r1.ebuild
 2207060710 ./media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild
 2207060940 ./media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
-2207060940 ./media-video/pipewire/pipewire-9999.ebuild
+2207090440 ./media-video/pipewire/pipewire-0.3.54-r1.ebuild
+2207090440 ./media-video/pipewire/pipewire-0.3.54.ebuild
+2207090440 ./media-video/pipewire/pipewire-9999.ebuild
 2201061809 ./media-video/pitivi/pitivi-0.999-r5.ebuild
 2206182010 ./media-video/pitivi/pitivi-2021.05-r1.ebuild
 2203200340 ./media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -21362,9 +21488,11 @@
 1909290609 ./media-video/vobcopy/vobcopy-1.2.0.ebuild
 2104180939 ./media-video/vstrip/vstrip-0.8f.ebuild
 2203081810 ./media-video/webcamoid/webcamoid-8.8.0.ebuild
-2207050840 ./media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
-2207050910 ./media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
-2207050910 ./media-video/wireplumber/wireplumber-9999.ebuild
+2207090440 ./media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
+2207090440 ./media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
+2207090710 ./media-video/wireplumber/wireplumber-0.4.11-r1.ebuild
+2207090440 ./media-video/wireplumber/wireplumber-0.4.11.ebuild
+2207090440 ./media-video/wireplumber/wireplumber-9999.ebuild
 2201051309 ./media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -21596,7 +21724,6 @@
 2203150009 ./net-analyzer/netperf/netperf-2.7.0-r3.ebuild
 2205230310 ./net-analyzer/netperf/netperf-2.7.0-r4.ebuild
 1702282250 ./net-analyzer/netpipe/netpipe-3.7.2.ebuild
-2110192240 ./net-analyzer/netselect/netselect-0.4-r1.ebuild
 2110192240 ./net-analyzer/netselect/netselect-9999.ebuild
 2205191040 ./net-analyzer/netselect/netselect-0.4-r2.ebuild
 2109080440 ./net-analyzer/nettop/nettop-0.2.3-r2.ebuild
@@ -21648,7 +21775,8 @@
 2104031909 ./net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild
 2109252239 ./net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild
 2109252239 ./net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild
-2109252239 ./net-analyzer/pmacct/pmacct-999999.ebuild
+2207090910 ./net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
+2207090910 ./net-analyzer/pmacct/pmacct-9999.ebuild
 2106201939 ./net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
 2203040040 ./net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
 1911091539 ./net-analyzer/poink/poink-2.03.ebuild
@@ -21763,6 +21891,7 @@
 2110021209 ./net-analyzer/wapiti/wapiti-3.0.5.ebuild
 2207040210 ./net-analyzer/wapiti/wapiti-3.1.2.ebuild
 2207040210 ./net-analyzer/wapiti/wapiti-9999.ebuild
+2207101610 ./net-analyzer/wapiti/wapiti-3.1.3.ebuild
 2203202209 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
 2202200940 ./net-analyzer/wireshark/wireshark-3.4.11.ebuild
 2202260039 ./net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -21901,6 +22030,7 @@
 2205171610 ./net-dns/openresolv/openresolv-3.12.0-r1.ebuild
 2206022210 ./net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
 2206022210 ./net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild
+2207081910 ./net-dns/pdns-recursor/pdns-recursor-4.7.1.ebuild
 2206170040 ./net-dns/pdns/pdns-4.6.2-r1.ebuild
 2205150410 ./net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
 2012311940 ./net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
@@ -22028,8 +22158,8 @@
 1901181409 ./net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
 2104210539 ./net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
 2104210539 ./net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
-2202072340 ./net-im/bitlbee/bitlbee-9999.ebuild
-2206211940 ./net-im/bitlbee/bitlbee-3.6-r1.ebuild
+2207091310 ./net-im/bitlbee/bitlbee-3.6-r1.ebuild
+2207091310 ./net-im/bitlbee/bitlbee-9999.ebuild
 2102160539 ./net-im/centerim/centerim-5.0.1-r1.ebuild
 2203020709 ./net-im/choqok/choqok-1.7.0-r1.ebuild
 2205190710 ./net-im/coturn/coturn-4.5.2-r1.ebuild
@@ -22063,6 +22193,7 @@
 2202170109 ./net-im/mcabber/mcabber-1.1.2-r1.ebuild
 2202170109 ./net-im/mcabber/mcabber-9999.ebuild
 2205131410 ./net-im/neochat/neochat-1.2.0.ebuild
+2207101610 ./net-im/neochat/neochat-22.06.ebuild
 2104172309 ./net-im/openmittsu/openmittsu-0.9.15.0.ebuild
 2206081111 ./net-im/pidgin/pidgin-2.14.8.ebuild
 2206081111 ./net-im/pidgin/pidgin-2.14.9.ebuild
@@ -22130,6 +22261,7 @@
 2205141340 ./net-im/cawbird/cawbird-1.5-r2.ebuild
 2206131210 ./net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
 2206192110 ./net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild
+2207091140 ./net-im/synapse/synapse-1.62.0.ebuild
 2203230410 ./net-irc/anope/anope-2.0.10-r1.ebuild
 2205281940 ./net-irc/anope/anope-2.0.11.ebuild
 2203281240 ./net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild
@@ -22139,8 +22271,7 @@
 2203060440 ./net-irc/eggdrop/eggdrop-1.9.2.ebuild
 2203061210 ./net-irc/eggdrop/eggdrop-1.9.1.ebuild
 2106302209 ./net-irc/emech/emech-3.0.99_p3-r1.ebuild
-2203110039 ./net-irc/epic5/epic5-2.0.1-r1.ebuild
-2206261110 ./net-irc/epic5/epic5-2.0.1-r2.ebuild
+2207090940 ./net-irc/epic5/epic5-2.0.1-r2.ebuild
 2203121539 ./net-irc/ergo/ergo-2.9.1-r1.ebuild
 2207031410 ./net-irc/ergo/ergo-2.10.0.ebuild
 2202140239 ./net-irc/hexchat/hexchat-9999.ebuild
@@ -22161,7 +22292,6 @@
 2201041239 ./net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
 2206241640 ./net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
 2206241640 ./net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
-2205191040 ./net-irc/irssi/irssi-1.2.3.ebuild
 2206120840 ./net-irc/irssi/irssi-9999.ebuild
 2207061040 ./net-irc/irssi/irssi-1.4.1.ebuild
 2010310139 ./net-irc/irssistats/irssistats-0.75-r1.ebuild
@@ -22453,13 +22583,13 @@
 2011051739 ./net-libs/nDPI/nDPI-3.4.ebuild
 2201041009 ./net-libs/nDPI/nDPI-4.0-r1.ebuild
 2202080940 ./net-libs/nDPI/nDPI-4.2.ebuild
-2202080940 ./net-libs/nDPI/nDPI-9999.ebuild
+2207090710 ./net-libs/nDPI/nDPI-4.4.ebuild
+2207090710 ./net-libs/nDPI/nDPI-9999.ebuild
 2203121509 ./net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
 2205241810 ./net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild
 2202111539 ./net-libs/neon/neon-0.32.2.ebuild
 2206241640 ./net-libs/net6/net6-1.3.14-r2.ebuild
 2111292309 ./net-libs/netwib/netwib-5.39.0.ebuild
-2110281809 ./net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
 2110191540 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2206251210 ./net-libs/nghttp2/nghttp2-1.47.0.ebuild
 2206241310 ./net-libs/nghttp2/nghttp2-1.48.0.ebuild
@@ -22500,8 +22630,8 @@
 2111100039 ./net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
 2206232340 ./net-libs/rest/rest-0.8.1-r1.ebuild
 2207021640 ./net-libs/rpc2/rpc2-2.14-r1.ebuild
-2104060140 ./net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
-2205191040 ./net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
+2207101110 ./net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
+2207101110 ./net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
 2105150539 ./net-libs/rtrlib/rtrlib-0.7.0.ebuild
 2204041439 ./net-libs/rtrlib/rtrlib-0.8.0.ebuild
 2206061910 ./net-libs/serf/serf-1.3.9-r3.ebuild
@@ -22577,7 +22707,7 @@
 2104161439 ./net-mail/dot-forward/dot-forward-0.71-r4.ebuild
 2205191710 ./net-mail/dovecot/dovecot-2.3.18-r1.ebuild
 2206141710 ./net-mail/dovecot/dovecot-2.3.19.1.ebuild
-2207080940 ./net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
+2207091540 ./net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
 2009050439 ./net-mail/email/email-3.1.3-r1.ebuild
 2203040410 ./net-mail/eps/eps-1.7-r1.ebuild
 2105252109 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.ebuild
@@ -22614,9 +22744,7 @@
 2105021809 ./net-mail/mpop/mpop-1.4.7.ebuild
 2102011639 ./net-mail/mswatch/mswatch-1.2.0-r1.ebuild
 2204222110 ./net-mail/mu/mu-1.6.10.ebuild
-2205230940 ./net-mail/mu/mu-1.7.23.ebuild
-2206092240 ./net-mail/mu/mu-1.6.11.ebuild
-2206261610 ./net-mail/mu/mu-1.8.1.ebuild
+2207091340 ./net-mail/mu/mu-1.8.5.ebuild
 2102191539 ./net-mail/muchsync/muchsync-6.ebuild
 2106190039 ./net-mail/nmzmail/nmzmail-1.1-r1.ebuild
 2202012209 ./net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -22666,7 +22794,6 @@
 2108220639 ./net-mail/vchkuser/vchkuser-0.4-r1.ebuild
 2203040040 ./net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
 2203110039 ./net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
-2103301239 ./net-mail/ytnef/ytnef-1.9.3.ebuild
 2110190309 ./net-mail/ytnef/ytnef-2.0.ebuild
 2203010209 ./net-mail/public-inbox/public-inbox-1.7.0.ebuild
 2207042240 ./net-mail/public-inbox/public-inbox-1.8.0.ebuild
@@ -22801,7 +22928,7 @@
 2206282140 ./net-misc/exabgp/exabgp-4.2.20.ebuild
 2204182140 ./net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
 2006211509 ./net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
-1808051739 ./net-misc/felix/felix-3.1.3.ebuild
+2207101440 ./net-misc/felix/felix-3.1.3.ebuild
 2205101940 ./net-misc/freerdp/freerdp-2.7.0-r1.ebuild
 2205101940 ./net-misc/freerdp/freerdp-2.9999.ebuild
 2205101940 ./net-misc/freerdp/freerdp-9999.ebuild
@@ -22893,6 +23020,7 @@
 2205181540 ./net-misc/kea/kea-2.0.2.ebuild
 2205181540 ./net-misc/kea/kea-9999.ebuild
 2104060140 ./net-misc/keychain/keychain-2.8.5.ebuild
+2207101440 ./net-misc/keychain/keychain-2.8.5-r1.ebuild
 2107301839 ./net-misc/knock/knock-0.8.ebuild
 1911050009 ./net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild
 2104161439 ./net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild
@@ -22960,7 +23088,7 @@
 2109050109 ./net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
 2203260309 ./net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
 2012311940 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
-2202180640 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+2207101540 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
 2203260309 ./net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
 2205050240 ./net-misc/netopeer2/netopeer2-2.1.16.ebuild
 2206291110 ./net-misc/netopeer2/netopeer2-2.1.23.ebuild
@@ -23035,10 +23163,11 @@
 1702282250 ./net-misc/ptpd/ptpd-2.3.1-r1.ebuild
 2105010309 ./net-misc/ptpd/ptpd-2.3.1-r2.ebuild
 1705171647 ./net-misc/puf/puf-1.0.0-r1.ebuild
-2202210411 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
-2203260309 ./net-misc/putty/putty-0.76.ebuild
-2205271340 ./net-misc/putty/putty-0.77.ebuild
-2205271340 ./net-misc/putty/putty-9999.ebuild
+2207090440 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
+2207090440 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+2207101210 ./net-misc/putty/putty-0.76.ebuild
+2207101210 ./net-misc/putty/putty-0.77-r1.ebuild
+2207101210 ./net-misc/putty/putty-9999.ebuild
 2110240439 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
 2102261739 ./net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
 2205201540 ./net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -23053,7 +23182,8 @@
 2101021039 ./net-misc/rclone/rclone-1.53.3.ebuild
 2009071239 ./net-misc/rclone/rclone-9999.ebuild
 2112250240 ./net-misc/rclone/rclone-1.57.0.ebuild
-2205030010 ./net-misc/rclone/rclone-1.58.1.ebuild
+2207101540 ./net-misc/rclone/rclone-1.58.1.ebuild
+2207101310 ./net-misc/rclone/rclone-1.59.0.ebuild
 2109230439 ./net-misc/rdate/rdate-1.10.ebuild
 2202170109 ./net-misc/rdate/rdate-1.10.2.ebuild
 2205272240 ./net-misc/rdate/rdate-1.11.ebuild
@@ -23137,8 +23267,9 @@
 2205102310 ./net-misc/sstp-client/sstp-client-1.0.17.ebuild
 2107172140 ./net-misc/streamlink/streamlink-1.3.1-r1.ebuild
 2107172140 ./net-misc/streamlink/streamlink-2.0.0.ebuild
-2206031140 ./net-misc/streamlink/streamlink-4.1.0-r2.ebuild
-2206031140 ./net-misc/streamlink/streamlink-9999.ebuild
+2207101610 ./net-misc/streamlink/streamlink-4.1.0-r2.ebuild
+2207101610 ./net-misc/streamlink/streamlink-4.2.0.ebuild
+2207101610 ./net-misc/streamlink/streamlink-9999.ebuild
 2002191709 ./net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
 2109302139 ./net-misc/stunnel/stunnel-5.59.ebuild
 2205141510 ./net-misc/stunnel/stunnel-5.64.ebuild
@@ -23229,6 +23360,7 @@
 2206271810 ./net-misc/mptcpd/mptcpd-9999.ebuild
 2206162010 ./net-misc/r8125/r8125-9.008.00.ebuild
 2206162010 ./net-misc/r8125/r8125-9.009.01.ebuild
+2207091410 ./net-misc/r8125/r8125-9.009.02.ebuild
 2203230039 ./net-misc/htail/htail-1.5.ebuild
 2204041939 ./net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
 2204051709 ./net-misc/ytmdl/ytmdl-2022.3.16.ebuild
@@ -23450,9 +23582,8 @@
 2205192310 ./net-proxy/hatop/hatop-0.8.1.ebuild
 2207030040 ./net-proxy/havp/havp-0.92a-r3.ebuild
 2102040639 ./net-proxy/microsocks/microsocks-1.0.2.ebuild
-2205141310 ./net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild
-2205141310 ./net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild
-2205211140 ./net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
+2207100940 ./net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
+2207101210 ./net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
 2104192239 ./net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
 2204110940 ./net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild
 2003261841 ./net-proxy/pingtunnel/pingtunnel-0.72.ebuild
@@ -23506,7 +23637,7 @@
 2205282140 ./net-vpn/frp/frp-0.43.0.ebuild
 2101101639 ./net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
 2203121509 ./net-vpn/i2p/i2p-1.6.1.ebuild
-2205241810 ./net-vpn/i2p/i2p-1.7.0.ebuild
+2207100940 ./net-vpn/i2p/i2p-1.7.0.ebuild
 2205251010 ./net-vpn/i2pd/i2pd-2.41.0.ebuild
 2205252210 ./net-vpn/i2pd/i2pd-2.42.1.ebuild
 2111020109 ./net-vpn/iodine/iodine-0.7.0-r3.ebuild
@@ -23591,7 +23722,7 @@
 2206101510 ./net-wireless/blueman/blueman-9999.ebuild
 2004041439 ./net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
 2201032209 ./net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild
-2205032210 ./net-wireless/bluez/bluez-5.64.ebuild
+2207091810 ./net-wireless/bluez/bluez-5.64.ebuild
 2104271709 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 2105050139 ./net-wireless/bss/bss-0.8-r2.ebuild
 2110212139 ./net-wireless/crackle/crackle-0.1-r1.ebuild
@@ -23604,7 +23735,6 @@
 2206172110 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
 2207060440 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.1.ebuild
 2207072140 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.2.ebuild
-2110011839 ./net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
 2206100910 ./net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
 2206100910 ./net-wireless/gnuradio/gnuradio-9999.ebuild
 2206251240 ./net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
@@ -24078,7 +24208,7 @@
 2206191140 ./sci-biology/pysam/pysam-0.19.1.ebuild
 2002231509 ./sci-biology/qrna/qrna-2.0.3c-r3.ebuild
 2104051739 ./sci-biology/raxml/raxml-7.2.6.ebuild
-2206192110 ./sci-biology/rebase/rebase-1901-r1.ebuild
+2207090640 ./sci-biology/rebase/rebase-1901-r2.ebuild
 2207072310 ./sci-biology/recon/recon-1.08-r1.ebuild
 2207072310 ./sci-biology/rnaview/rnaview-20040713-r5.ebuild
 2105131709 ./sci-biology/samtools/samtools-0.1.20-r4.ebuild
@@ -24094,8 +24224,7 @@
 2204260910 ./sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
 2105092239 ./sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
 2207072310 ./sci-biology/trf/trf-4.04-r2.ebuild
-1704271319 ./sci-biology/trnascan-se/trnascan-se-1.31.ebuild
-2207030310 ./sci-biology/trnascan-se/trnascan-se-1.31-r1.ebuild
+2207091310 ./sci-biology/trnascan-se/trnascan-se-1.31-r2.ebuild
 2106150539 ./sci-biology/uchime/uchime-4.2.40.ebuild
 2106110339 ./sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
 2010280109 ./sci-biology/unafold/unafold-3.8-r1.ebuild
@@ -24259,10 +24388,9 @@
 2205161140 ./sci-electronics/kicad/kicad-5.1.12-r3.ebuild
 2206220010 ./sci-electronics/kicad/kicad-6.0.6.ebuild
 2206220010 ./sci-electronics/kicad/kicad-9999.ebuild
-2109182309 ./sci-electronics/klayout/klayout-0.27.ebuild
-2109182309 ./sci-electronics/klayout/klayout-9999.ebuild
-2202061840 ./sci-electronics/klayout/klayout-0.27.3.ebuild
-2202061840 ./sci-electronics/klayout/klayout-0.27.7.ebuild
+2207091540 ./sci-electronics/klayout/klayout-0.27.10.ebuild
+2207091510 ./sci-electronics/klayout/klayout-0.27.7.ebuild
+2207091510 ./sci-electronics/klayout/klayout-9999.ebuild
 2111301739 ./sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild
 2111092239 ./sci-electronics/labone/labone-21.08.20515-r1.ebuild
 2105310009 ./sci-electronics/librepcb/librepcb-0.1.5.ebuild
@@ -24535,6 +24663,7 @@
 2205050240 ./sci-libs/gdal/gdal-3.4.3-r1.ebuild
 2205171140 ./sci-libs/gdal/gdal-3.5.0-r3.ebuild
 2206302240 ./sci-libs/gdal/gdal-3.5.0-r4.ebuild
+2207090910 ./sci-libs/gdal/gdal-3.5.1.ebuild
 2112080809 ./sci-libs/geos/geos-3.10.0.ebuild
 2205051010 ./sci-libs/geos/geos-3.10.2.ebuild
 2207022340 ./sci-libs/geos/geos-3.11.0.ebuild
@@ -24653,8 +24782,7 @@
 2102181209 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
 2104110139 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
 2204241910 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
-2104110139 ./sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
-2205191810 ./sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
+2207101110 ./sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
 2205150040 ./sci-libs/lis/lis-1.6.5.ebuild
 2207060840 ./sci-libs/lmfit/lmfit-9.0-r1.ebuild
 2110231709 ./sci-libs/lrslib/lrslib-071b.ebuild
@@ -24689,7 +24817,7 @@
 2206131040 ./sci-libs/netcdf/netcdf-4.8.1-r2.ebuild
 2205150040 ./sci-libs/nfft/nfft-3.5.2.ebuild
 2110252039 ./sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
-2205180511 ./sci-libs/nlopt/nlopt-2.7.1.ebuild
+2207091540 ./sci-libs/nlopt/nlopt-2.7.1.ebuild
 2201131940 ./sci-libs/numkit/numkit-1.1.2-r1.ebuild
 2105311239 ./sci-libs/o2scl/o2scl-0.920.ebuild
 2006111539 ./sci-libs/oc/oc-2.0.ebuild
@@ -24735,10 +24863,10 @@
 2110120139 ./sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
 2203060010 ./sci-libs/rocBLAS/rocBLAS-4.3.0.ebuild
 2203201040 ./sci-libs/rocBLAS/rocBLAS-4.3.0-r1.ebuild
-2203270640 ./sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild
+2207082040 ./sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
 2101241109 ./sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
-2203201210 ./sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
-2203270640 ./sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+2207090940 ./sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
+2207090940 ./sci-libs/rocFFT/rocFFT-5.0.2.ebuild
 2101241109 ./sci-libs/rocPRIM/rocPRIM-4.0.0-r1.ebuild
 2205021140 ./sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
 2205030910 ./sci-libs/rocPRIM/rocPRIM-5.0.2.ebuild
@@ -26293,6 +26421,7 @@
 2205051840 ./sys-apps/haveged/haveged-1.9.18.ebuild
 2007171109 ./sys-apps/hd-idle/hd-idle-1.05-r1.ebuild
 2205252010 ./sys-apps/hdparm/hdparm-9.63.ebuild
+2207091140 ./sys-apps/hdparm/hdparm-9.64.ebuild
 2106190040 ./sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
 2204291110 ./sys-apps/help2man/help2man-1.48.5.ebuild
 2104212209 ./sys-apps/highway/highway-1.1.0.ebuild
@@ -26309,6 +26438,7 @@
 2203270439 ./sys-apps/hwloc/hwloc-2.5.0.ebuild
 2203270439 ./sys-apps/hwloc/hwloc-2.6.0.ebuild
 2205191340 ./sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+2207090910 ./sys-apps/hwloc/hwloc-2.8.0.ebuild
 2101310343 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
 2205071040 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
 2205072110 ./sys-apps/i2c-tools/i2c-tools-4.3.ebuild
@@ -26317,7 +26447,6 @@
 2202100210 ./sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r2.ebuild
 2104130339 ./sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
 2012311940 ./sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
-2012311940 ./sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
 2112050810 ./sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
 2111060814 ./sys-apps/input-utils/input-utils-1.3.ebuild
 2003261841 ./sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -26425,8 +26554,7 @@
 2205191440 ./sys-apps/nvme-cli/nvme-cli-2.0.ebuild
 2206182110 ./sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
 2206182110 ./sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
-2202100210 ./sys-apps/onerng/onerng-3.6-r4.ebuild
-2206061610 ./sys-apps/onerng/onerng-3.7.ebuild
+2207100040 ./sys-apps/onerng/onerng-3.7.ebuild
 2111090809 ./sys-apps/opal-utils/opal-utils-6.8.ebuild
 2201140110 ./sys-apps/opal-utils/opal-utils-7.0.ebuild
 2206082310 ./sys-apps/openrc/openrc-0.44.10.ebuild
@@ -26510,7 +26638,6 @@
 2206250910 ./sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
 2206250910 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
 2206250910 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
-2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
 2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
 2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
 2206250910 ./sys-apps/s6/s6-2.11.1.0-r1.ebuild
@@ -26901,9 +27028,9 @@
 2112030339 ./sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
 2002230040 ./sys-cluster/fake/fake-1.1.10.ebuild
 2201011409 ./sys-cluster/galera/galera-25.3.35.ebuild
-2207080410 ./sys-cluster/galera/galera-25.3.28-r2.ebuild
 2207080410 ./sys-cluster/galera/galera-26.4.10-r1.ebuild
 2207081010 ./sys-cluster/galera/galera-26.4.8-r1.ebuild
+2207090110 ./sys-cluster/galera/galera-25.3.28-r2.ebuild
 2106180139 ./sys-cluster/ganglia-web/ganglia-web-3.7.3-r2.ebuild
 2106230209 ./sys-cluster/ganglia/ganglia-3.7.1-r3.ebuild
 2201011409 ./sys-cluster/gasnet/gasnet-1.32.0.ebuild
@@ -26915,8 +27042,8 @@
 2205160610 ./sys-cluster/gmqtt/gmqtt-0.4.1.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.0-r4.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.3.ebuild
-2206031140 ./sys-cluster/hpx/hpx-1.8.0.ebuild
 2206031140 ./sys-cluster/hpx/hpx-9999.ebuild
+2207090810 ./sys-cluster/hpx/hpx-1.8.0.ebuild
 2201011409 ./sys-cluster/ipvsadm/ipvsadm-1.31-r1.ebuild
 2203040040 ./sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
 2204300510 ./sys-cluster/k3s/k3s-1.23.6_p1.ebuild
@@ -27027,8 +27154,8 @@
 2203040040 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
 2206202110 ./sys-cluster/sanlock/sanlock-3.8.4.ebuild
 2203210210 ./sys-cluster/singularity/singularity-3.8.7.ebuild
-2202020939 ./sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
-2206261010 ./sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
+2207091210 ./sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
+2207091210 ./sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
 2012151239 ./sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
 2012151239 ./sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
 2012102109 ./sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
@@ -27083,9 +27210,7 @@
 2203181010 ./sys-devel/binutils/binutils-2.37_p1-r2.ebuild
 2203191310 ./sys-devel/binutils/binutils-2.38-r1.ebuild
 2205300940 ./sys-devel/binutils/binutils-2.38-r2.ebuild
-2206122310 ./sys-devel/binutils/binutils-2.37_p1-r3.ebuild
-2206122310 ./sys-devel/binutils/binutils-2.38-r3.ebuild
-2206122310 ./sys-devel/binutils/binutils-9999.ebuild
+2207091510 ./sys-devel/binutils/binutils-9999.ebuild
 2105221839 ./sys-devel/bison/bison-3.7.6.ebuild
 2204290540 ./sys-devel/bison/bison-3.8.2.ebuild
 2205281910 ./sys-devel/bmake/bmake-20220418.ebuild
@@ -27121,6 +27246,7 @@
 2204241940 ./sys-devel/crossdev/crossdev-20220424.ebuild
 2206172210 ./sys-devel/crossdev/crossdev-20220617.ebuild
 2206172210 ./sys-devel/crossdev/crossdev-99999999.ebuild
+2207090710 ./sys-devel/crossdev/crossdev-20220709.ebuild
 2002112051 ./sys-devel/ct-ng/ct-ng-1.24.0.ebuild
 2203261110 ./sys-devel/dev86/dev86-0.16.21-r3.ebuild
 2104060140 ./sys-devel/distcc/distcc-3.3.3-r3.ebuild
@@ -27156,6 +27282,9 @@
 2207030540 ./sys-devel/gcc/gcc-11.3.0.ebuild
 2207030540 ./sys-devel/gcc/gcc-11.3.1_p20220701.ebuild
 2207030540 ./sys-devel/gcc/gcc-12.1.1_p20220702.ebuild
+2207101440 ./sys-devel/gcc/gcc-10.4.1_p20220707.ebuild
+2207101440 ./sys-devel/gcc/gcc-11.3.1_p20220708.ebuild
+2207101440 ./sys-devel/gcc/gcc-12.1.1_p20220709.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2206121640 ./sys-devel/gdb/gdb-11.2.ebuild
 2206121640 ./sys-devel/gdb/gdb-12.1.ebuild
@@ -27583,13 +27712,7 @@
 2206291610 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.51.ebuild
 2206291610 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.8.ebuild
 2206291610 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.202.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild
 2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.9.ebuild
-2207022240 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.287.ebuild
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.251.ebuild
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.322.ebuild
@@ -27597,6 +27720,12 @@
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.53.ebuild
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.10.ebuild
 2207072110 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.204.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild
+2207091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
 2206061542 ./sys-kernel/git-sources/git-sources-5.19_rc1.ebuild
 2206130340 ./sys-kernel/git-sources/git-sources-5.19_rc2.ebuild
 2206200040 ./sys-kernel/git-sources/git-sources-5.19_rc3.ebuild
@@ -27608,9 +27737,8 @@
 1912110241 ./sys-kernel/kpatch/kpatch-9999.ebuild
 2206110910 ./sys-kernel/kpatch/kpatch-0.9.4.ebuild
 2206152110 ./sys-kernel/kpatch/kpatch-0.9.6.ebuild
-2204102110 ./sys-kernel/linux-docs/linux-docs-5.15.33.ebuild
+2207082040 ./sys-kernel/linux-docs/linux-docs-5.15.53.ebuild
 2203122239 ./sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
-2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210629.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210716.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210818.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210919.ebuild
@@ -27621,6 +27749,7 @@
 2205191140 ./sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
 2206131440 ./sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
 2207071940 ./sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+2207082040 ./sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.16.ebuild
@@ -28097,8 +28226,8 @@
 2204290540 ./virtual/libc/libc-1-r1.ebuild
 2201012339 ./virtual/libcrypt/libcrypt-1-r1.ebuild
 2204290540 ./virtual/libcrypt/libcrypt-2.ebuild
-2002112051 ./virtual/libelf/libelf-2.ebuild
-2205010512 ./virtual/libelf/libelf-3.ebuild
+2207101110 ./virtual/libelf/libelf-2-r1.ebuild
+2207101110 ./virtual/libelf/libelf-3-r1.ebuild
 2204290540 ./virtual/libiconv/libiconv-0-r2.ebuild
 2204290540 ./virtual/libintl/libintl-0-r2.ebuild
 2109072109 ./virtual/libudev/libudev-232-r5.ebuild
@@ -28374,6 +28503,7 @@
 2205031110 ./www-apps/drupal/drupal-9.2.18.ebuild
 2206110110 ./www-apps/element/element-1.10.14.ebuild
 2206182010 ./www-apps/element/element-1.10.15.ebuild
+2207091440 ./www-apps/element/element-1.11.0.ebuild
 2205300910 ./www-apps/gitea/gitea-1.16.7.ebuild
 2206121040 ./www-apps/gitea/gitea-1.16.8.ebuild
 2104191209 ./www-apps/gitit/gitit-0.13.0.0-r1.ebuild
@@ -28412,6 +28542,7 @@
 2109182009 ./www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.2.1.ebuild
 2207030140 ./www-apps/mediawiki/mediawiki-1.37.3.ebuild
 2207030140 ./www-apps/mediawiki/mediawiki-1.38.2.ebuild
+2207082110 ./www-apps/mediawiki/mediawiki-1.37.4.ebuild
 2104161439 ./www-apps/mirmon/mirmon-2.11-r2.ebuild
 2205091740 ./www-apps/moodle/moodle-3.10.11.ebuild
 2205091740 ./www-apps/moodle/moodle-3.11.7.ebuild
@@ -28425,10 +28556,12 @@
 2203181010 ./www-apps/nanoc-cli/nanoc-cli-4.12.3.ebuild
 2204100840 ./www-apps/nanoc-cli/nanoc-cli-4.12.5.ebuild
 2205290910 ./www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
+2207100940 ./www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild
 2107121009 ./www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
 2203181010 ./www-apps/nanoc-core/nanoc-core-4.12.3.ebuild
 2204100840 ./www-apps/nanoc-core/nanoc-core-4.12.5.ebuild
 2205290910 ./www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
+2207100940 ./www-apps/nanoc-core/nanoc-core-4.12.7.ebuild
 2203181010 ./www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
 2205290910 ./www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
 2205290910 ./www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
@@ -28436,6 +28569,7 @@
 2111141139 ./www-apps/nanoc/nanoc-4.12.3.ebuild
 2204100840 ./www-apps/nanoc/nanoc-4.12.5.ebuild
 2205290910 ./www-apps/nanoc/nanoc-4.12.6.ebuild
+2207100940 ./www-apps/nanoc/nanoc-4.12.7.ebuild
 2104131839 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.1.7.ebuild
 2106181339 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.0.ebuild
 2106251439 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.1.ebuild
@@ -28490,6 +28624,7 @@
 2111011140 ./www-client/elinks/elinks-0.13.5-r100.ebuild
 2111011140 ./www-client/elinks/elinks-9999.ebuild
 2205280910 ./www-client/epiphany/epiphany-42.2.ebuild
+2207092311 ./www-client/epiphany/epiphany-42.3.ebuild
 2205202210 ./www-client/falkon/falkon-3.2.0-r1.ebuild
 2207071410 ./www-client/falkon/falkon-22.04.3.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
@@ -28591,10 +28726,8 @@
 2110190339 ./www-plugins/pdfjs/pdfjs-2.10.377.ebuild
 2207040210 ./www-plugins/pdfjs/pdfjs-2.14.305.ebuild
 2203201310 ./www-servers/adsf/adsf-1.4.6-r1.ebuild
-2203181040 ./www-servers/apache/apache-2.4.53.ebuild
-2204121110 ./www-servers/apache/apache-2.4.53-r1.ebuild
-2206241740 ./www-servers/apache/apache-2.4.54.ebuild
-2206291210 ./www-servers/apache/apache-2.4.54-r1.ebuild
+2207100040 ./www-servers/apache/apache-2.4.54-r2.ebuild
+2207100040 ./www-servers/apache/apache-2.4.54-r3.ebuild
 2001051839 ./www-servers/boa/boa-0.94.14_rc21-r2.ebuild
 2206030540 ./www-servers/caddy/caddy-2.5.1.ebuild
 2108131639 ./www-servers/civetweb/civetweb-1.12.ebuild
@@ -28612,14 +28745,8 @@
 2201012339 ./www-servers/monkeyd/monkeyd-9999.ebuild
 2109190009 ./www-servers/moonbridge/moonbridge-1.0.1.ebuild
 2201310309 ./www-servers/nginx-unit/nginx-unit-1.26.1.ebuild
-2203230410 ./www-servers/nginx/nginx-1.20.1-r3.ebuild
-2203230410 ./www-servers/nginx/nginx-1.20.2-r1.ebuild
-2203230410 ./www-servers/nginx/nginx-1.21.0-r3.ebuild
-2203230410 ./www-servers/nginx/nginx-1.21.1-r1.ebuild
-2203230410 ./www-servers/nginx/nginx-1.21.2-r1.ebuild
-2203230410 ./www-servers/nginx/nginx-1.21.3-r1.ebuild
-2203230410 ./www-servers/nginx/nginx-1.21.4-r1.ebuild
-2206081210 ./www-servers/nginx/nginx-1.21.6-r1.ebuild
+2207081940 ./www-servers/nginx-unit/nginx-unit-1.27.0.ebuild
+2207100040 ./www-servers/nginx/nginx-1.21.6-r2.ebuild
 2206110840 ./www-servers/pound/pound-3.0.2.ebuild
 2206110840 ./www-servers/pound/pound-3.0.ebuild
 2105022339 ./www-servers/pshs/pshs-0.4.1.ebuild
@@ -28633,12 +28760,12 @@
 2107202209 ./www-servers/thttpd/thttpd-2.27.1-r2.ebuild
 2107202209 ./www-servers/thttpd/thttpd-9999.ebuild
 2206011440 ./www-servers/tomcat/tomcat-7.0.109-r1.ebuild
-2206120710 ./www-servers/tomcat/tomcat-10.0.22.ebuild
-2206101010 ./www-servers/tomcat/tomcat-9.0.64.ebuild
 2206160940 ./www-servers/tomcat/tomcat-10.0.21.ebuild
 2206160940 ./www-servers/tomcat/tomcat-8.5.79.ebuild
-2206140710 ./www-servers/tomcat/tomcat-8.5.81.ebuild
 2206160940 ./www-servers/tomcat/tomcat-9.0.63.ebuild
+2207101540 ./www-servers/tomcat/tomcat-10.0.22.ebuild
+2207101540 ./www-servers/tomcat/tomcat-8.5.81.ebuild
+2207101540 ./www-servers/tomcat/tomcat-9.0.64.ebuild
 2205010512 ./www-servers/tornado/tornado-6.1.ebuild
 2205131240 ./www-servers/tornado/tornado-6.1-r1.ebuild
 2207040840 ./www-servers/tornado/tornado-6.2.ebuild
@@ -28873,6 +29000,7 @@
 2203110039 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
 2206041540 ./x11-libs/libdrm/libdrm-9999.ebuild
 2206241410 ./x11-libs/libdrm/libdrm-2.4.111.ebuild
+2207100310 ./x11-libs/libdrm/libdrm-2.4.112.ebuild
 2207060940 ./x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
 2206280511 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2205251440 ./x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -28945,10 +29073,10 @@
 2105251739 ./x11-libs/tslib/tslib-1.22.ebuild
 2103060139 ./x11-libs/vte/vte-0.28.2-r209.ebuild
 2205311240 ./x11-libs/vte/vte-0.68.0.ebuild
-2110291639 ./x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
 2101182239 ./x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
 2105131709 ./x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
-2207072340 ./x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
+2207100210 ./x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
+2207091540 ./x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
 2012311940 ./x11-libs/xbae/xbae-4.60.4.ebuild
 2205090840 ./x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
 2206172140 ./x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
@@ -28993,8 +29121,8 @@
 2204081839 ./x11-misc/birdtray/birdtray-1.9.0.ebuild
 2204081839 ./x11-misc/birdtray/birdtray-9999.ebuild
 1702282250 ./x11-misc/blockdpy/blockdpy-1-r1.ebuild
-2104122109 ./x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
-2104110040 ./x11-misc/bumblebee/bumblebee-9999.ebuild
+2207091810 ./x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
+2207091810 ./x11-misc/bumblebee/bumblebee-9999.ebuild
 2103160039 ./x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
 2203160310 ./x11-misc/cbatticon/cbatticon-1.6.12.ebuild
 2206020310 ./x11-misc/cbatticon/cbatticon-1.6.13.ebuild
@@ -29386,7 +29514,7 @@
 2204212309 ./x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild
 2203110209 ./x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
 2203040040 ./x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
-2204212309 ./x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
+2207090640 ./x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
 1801041239 ./x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
 2204230440 ./x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
 2104192239 ./x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
@@ -29482,17 +29610,17 @@
 2206110110 ./x11-plugins/wmbattery/wmbattery-2.56.ebuild
 2203040410 ./x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
 2203040410 ./x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
-2203040410 ./x11-plugins/wmbio/wmbio-1.02.ebuild
+2207091910 ./x11-plugins/wmbio/wmbio-1.02.ebuild
 2203040410 ./x11-plugins/wmblob/wmblob-1.0.4.ebuild
 2012171539 ./x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
 1811092139 ./x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
 1809192109 ./x11-plugins/wmcalc/wmcalc-0.7.ebuild
 2203040410 ./x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
-1904020509 ./x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+2207091910 ./x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
 2203040410 ./x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
 2008252139 ./x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
 2203040410 ./x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
-2003291839 ./x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
+2207091910 ./x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
 2203040410 ./x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
 2203040410 ./x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
 2207080040 ./x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
@@ -29501,7 +29629,7 @@
 2203200340 ./x11-plugins/wmcube/wmcube-1.0.2.ebuild
 1807262339 ./x11-plugins/wmdiskmon/wmdiskmon-0.0.2-r1.ebuild
 2003011839 ./x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
-2203040410 ./x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+2207091910 ./x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
 2203040410 ./x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
 2203040410 ./x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
 2202201909 ./x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
@@ -29509,7 +29637,7 @@
 2003011839 ./x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
 2110162109 ./x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
 1805220439 ./x11-plugins/wmget/wmget-0.6.1.ebuild
-2203040410 ./x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+2207091910 ./x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
 2012231444 ./x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
 1805052238 ./x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
 1812230209 ./x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild
@@ -29517,7 +29645,7 @@
 2203040410 ./x11-plugins/wmifs/wmifs-1.8.ebuild
 2203040410 ./x11-plugins/wminet/wminet-3.0.0-r2.ebuild
 1810211139 ./x11-plugins/wmitime/wmitime-0.5-r1.ebuild
-2012171539 ./x11-plugins/wmix/wmix-3.5.ebuild
+2207101740 ./x11-plugins/wmix/wmix-3.5.ebuild
 1808022339 ./x11-plugins/wmlife/wmlife-1.0.1-r1.ebuild
 2203040410 ./x11-plugins/wmload/wmload-0.9.7-r1.ebuild
 1907151840 ./x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild
@@ -29538,7 +29666,7 @@
 2203040410 ./x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
 2206251810 ./x11-plugins/wmnet/wmnet-1.06-r2.ebuild
 1808251109 ./x11-plugins/wmnetload/wmnetload-1.3-r6.ebuild
-1809152339 ./x11-plugins/wmpager/wmpager-1.2-r2.ebuild
+2207091910 ./x11-plugins/wmpager/wmpager-1.2-r2.ebuild
 2203040410 ./x11-plugins/wmpasman/wmpasman-2.2.ebuild
 2203040410 ./x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
 2002030239 ./x11-plugins/wmping/wmping-0.2.1-r1.ebuild
@@ -29546,7 +29674,7 @@
 2202201909 ./x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
 2101030239 ./x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
 2203040410 ./x11-plugins/wmppp/wmppp-1.3.2-r2.ebuild
-1808022339 ./x11-plugins/wmrack/wmrack-1.4-r1.ebuild
+2207101710 ./x11-plugins/wmrack/wmrack-1.4-r1.ebuild
 2203200340 ./x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
 1810071609 ./x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
 2201140310 ./x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
@@ -29888,11 +30016,13 @@
 2202220139 ./xfce-base/libxfce4util/libxfce4util-4.17.2.ebuild
 2204031110 ./xfce-base/thunar/thunar-4.17.8.ebuild
 2205051040 ./xfce-base/thunar/thunar-4.16.11.ebuild
+2207092340 ./xfce-base/thunar/thunar-4.17.9.ebuild
 2105290309 ./xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
 2109221109 ./xfce-base/xfce4-appfinder/xfce4-appfinder-4.17.0.ebuild
 2107251109 ./xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
 2205230840 ./xfce-base/xfce4-panel/xfce4-panel-4.17.1.ebuild
 2206071310 ./xfce-base/xfce4-panel/xfce4-panel-4.16.4.ebuild
+2207101440 ./xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
 2105290309 ./xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
 2205042140 ./xfce-base/xfce4-settings/xfce4-settings-4.16.2.ebuild
 2207051740 ./xfce-base/xfce4-settings/xfce4-settings-4.16.3.ebuild
@@ -30129,894 +30259,896 @@
 2206110511 ./sec-keys/openpgp-keys-file/openpgp-keys-file-20220611.ebuild
 2206111440 ./sec-keys/openpgp-keys-llvm/openpgp-keys-llvm-14.ebuild
 2201010309 ./skel.ebuild
-2206272223 metadata/md5-cache/acct-group/abrt-0-r1
-2206272223 metadata/md5-cache/acct-group/adm-0-r1
-2206272223 metadata/md5-cache/acct-group/aerospike-amc-0
-2206272223 metadata/md5-cache/acct-group/airdcppd-0-r1
-2206272223 metadata/md5-cache/acct-group/alertmanager-0
-2206272223 metadata/md5-cache/acct-group/amanda-0
-2206272223 metadata/md5-cache/acct-group/amavis-0-r1
-2206272223 metadata/md5-cache/acct-group/amule-0-r1
-2206272223 metadata/md5-cache/acct-group/android-0
-2206272223 metadata/md5-cache/acct-group/anope-0-r1
-2206272223 metadata/md5-cache/acct-group/apache-0-r2
-2206272223 metadata/md5-cache/acct-group/apt-cacher-ng-0
-2206272223 metadata/md5-cache/acct-group/argus-0
-2206272223 metadata/md5-cache/acct-group/arpwatch-0
-2206272223 metadata/md5-cache/acct-group/artifactory-0
-2206272223 metadata/md5-cache/acct-group/aspnet-0
-2206272223 metadata/md5-cache/acct-group/asterisk-0-r1
-2206272223 metadata/md5-cache/acct-group/at-0
-2206272223 metadata/md5-cache/acct-group/atheme-services-0-r1
-2206272223 metadata/md5-cache/acct-group/audio-0-r1
-2206272223 metadata/md5-cache/acct-group/automatic-0
-2206272223 metadata/md5-cache/acct-group/automx2-0-r1
-2206272223 metadata/md5-cache/acct-group/avahi-0-r1
-2206272223 metadata/md5-cache/acct-group/avahi-autoipd-0-r1
-2206272223 metadata/md5-cache/acct-group/axtls-0
-2206272223 metadata/md5-cache/acct-group/backuppc-0
-2206272223 metadata/md5-cache/acct-group/bacula-0-r1
-2206272223 metadata/md5-cache/acct-group/bareos-0-r1
-2206272223 metadata/md5-cache/acct-group/beanstalk-0
-2206272223 metadata/md5-cache/acct-group/bedrock-0-r1
-2206272223 metadata/md5-cache/acct-group/biboumi-0
-2206272223 metadata/md5-cache/acct-group/bind_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/bird-0
-2206272223 metadata/md5-cache/acct-group/bitcoin-0-r1
-2206272223 metadata/md5-cache/acct-group/bitflu-0
-2206272223 metadata/md5-cache/acct-group/bitlbee-0-r1
-2206272223 metadata/md5-cache/acct-group/blackbox_exporter-0
-2206272223 metadata/md5-cache/acct-group/boinc-0
-2206272223 metadata/md5-cache/acct-group/brlapi-0
-2206272223 metadata/md5-cache/acct-group/brltty-0
-2206272223 metadata/md5-cache/acct-group/buildbot-0-r1
-2206272223 metadata/md5-cache/acct-group/bumblebee-0
-2206272223 metadata/md5-cache/acct-group/burp-0-r1
-2206272223 metadata/md5-cache/acct-group/burrow_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/cadvisor-0-r1
-2206272223 metadata/md5-cache/acct-group/cancd-0
-2206272223 metadata/md5-cache/acct-group/carbon-0-r1
-2206272223 metadata/md5-cache/acct-group/cdrom-0-r1
-2206272223 metadata/md5-cache/acct-group/ceph-0-r1
-2206272223 metadata/md5-cache/acct-group/cgit-0
-2206272223 metadata/md5-cache/acct-group/chronograf-0-r1
-2206272223 metadata/md5-cache/acct-group/cinder-0-r1
-2206272223 metadata/md5-cache/acct-group/clair-0-r1
-2206272223 metadata/md5-cache/acct-group/clamav-0-r1
-2206272223 metadata/md5-cache/acct-group/cmd5checkpw-0-r1
-2206272223 metadata/md5-cache/acct-group/cntlm-0
-2206272223 metadata/md5-cache/acct-group/cockroach-0
-2206272223 metadata/md5-cache/acct-group/collectd-0
-2206272223 metadata/md5-cache/acct-group/colord-0
-2206272223 metadata/md5-cache/acct-group/consul-0-r1
-2206272223 metadata/md5-cache/acct-group/consul-template-0-r1
-2206272223 metadata/md5-cache/acct-group/consul_exporter-0
-2206272223 metadata/md5-cache/acct-group/coredns-0
-2206272223 metadata/md5-cache/acct-group/croc-0
-2206272223 metadata/md5-cache/acct-group/cron-0
-2206272223 metadata/md5-cache/acct-group/crontab-0
-2206272223 metadata/md5-cache/acct-group/cvmfs-0-r1
-2206272223 metadata/md5-cache/acct-group/davfs2-0-r1
-2206272223 metadata/md5-cache/acct-group/dbmail-0
-2206272223 metadata/md5-cache/acct-group/dbskkd-0
-2206272223 metadata/md5-cache/acct-group/ddclient-0-r1
-2206272223 metadata/md5-cache/acct-group/defang-0
-2206272223 metadata/md5-cache/acct-group/dehydrated-0
-2206272223 metadata/md5-cache/acct-group/deluge-0-r1
-2206272223 metadata/md5-cache/acct-group/dhcp-0-r1
-2206272223 metadata/md5-cache/acct-group/dhcpcd-0-r1
-2206272223 metadata/md5-cache/acct-group/dialout-0-r1
-2206272223 metadata/md5-cache/acct-group/dictd-0
-2206272223 metadata/md5-cache/acct-group/dirsrv-0
-2206272223 metadata/md5-cache/acct-group/disk-0-r1
-2206272223 metadata/md5-cache/acct-group/distcc-1
-2206272223 metadata/md5-cache/acct-group/dnrd-0
-2206272223 metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
-2206272223 metadata/md5-cache/acct-group/dnsdist-0-r1
-2206272223 metadata/md5-cache/acct-group/dnsmasq-0-r1
-2206272223 metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/docker-0-r1
-2206272223 metadata/md5-cache/acct-group/docker_auth-0-r1
-2206272223 metadata/md5-cache/acct-group/dovecot-0-r1
-2206272223 metadata/md5-cache/acct-group/dovenull-0-r1
-2206272223 metadata/md5-cache/acct-group/drone-0
-2206272223 metadata/md5-cache/acct-group/ejabberd-0
-2206272223 metadata/md5-cache/acct-group/elasticsearch-0-r1
-2206272223 metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/energi3-0
-2206272223 metadata/md5-cache/acct-group/epam-0
-2206272223 metadata/md5-cache/acct-group/epmd-0-r1
-2206272223 metadata/md5-cache/acct-group/err-0
-2206272223 metadata/md5-cache/acct-group/etcd-0-r1
-2206272223 metadata/md5-cache/acct-group/exabgp-0-r1
-2206272223 metadata/md5-cache/acct-group/ez-ipupd-0
-2206272223 metadata/md5-cache/acct-group/fax-0
-2206272223 metadata/md5-cache/acct-group/fcron-0
-2206272223 metadata/md5-cache/acct-group/fdm-0
-2206272223 metadata/md5-cache/acct-group/fetchmail-0-r1
-2206272223 metadata/md5-cache/acct-group/fhem-0-r1
-2206272223 metadata/md5-cache/acct-group/fingerprint-0-r1
-2206272223 metadata/md5-cache/acct-group/firebird-0-r1
-2206272223 metadata/md5-cache/acct-group/flatpak-0
-2206272223 metadata/md5-cache/acct-group/flows-0
-2206272223 metadata/md5-cache/acct-group/fluentd-0-r1
-2206272223 metadata/md5-cache/acct-group/foldingathome-0
-2206272223 metadata/md5-cache/acct-group/fp-multiuser-0
-2206272223 metadata/md5-cache/acct-group/freenet-0
-2206272223 metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
-2206272223 metadata/md5-cache/acct-group/frr-0
-2206272223 metadata/md5-cache/acct-group/ftp-0-r1
-2206272223 metadata/md5-cache/acct-group/ftpproxy-0
-2206272223 metadata/md5-cache/acct-group/fvwm-crystal-0-r1
-2206272223 metadata/md5-cache/acct-group/gamemode-0
-2206272223 metadata/md5-cache/acct-group/gamestat-0-r1
-2206272223 metadata/md5-cache/acct-group/gatling-0-r1
-2206272223 metadata/md5-cache/acct-group/gauth-0
-2206272223 metadata/md5-cache/acct-group/gdm-0
-2206272223 metadata/md5-cache/acct-group/geneweb-0-r1
-2206272223 metadata/md5-cache/acct-group/geoclue-0
-2206272223 metadata/md5-cache/acct-group/gerbera-0-r1
-2206272223 metadata/md5-cache/acct-group/git-0-r1
-2206272223 metadata/md5-cache/acct-group/github-exporter-0
-2206272223 metadata/md5-cache/acct-group/gitlab-runner-1
-2206272223 metadata/md5-cache/acct-group/gkrellmd-0-r1
-2206272223 metadata/md5-cache/acct-group/glance-0-r1
-2206272223 metadata/md5-cache/acct-group/gluster-0-r1
-2206272223 metadata/md5-cache/acct-group/gnump3d-0
-2206272223 metadata/md5-cache/acct-group/gnupg-pkcs11-0
-2206272223 metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
-2206272223 metadata/md5-cache/acct-group/gopher-0
-2206272223 metadata/md5-cache/acct-group/gopherd-0
-2206272223 metadata/md5-cache/acct-group/gpib-0-r1
-2206272223 metadata/md5-cache/acct-group/gpio-0
-2206272223 metadata/md5-cache/acct-group/grafana-0-r1
-2206272223 metadata/md5-cache/acct-group/graylog-0-r1
-2206272223 metadata/md5-cache/acct-group/greetd-0-r1
-2206272223 metadata/md5-cache/acct-group/grok_exporter-0
-2206272223 metadata/md5-cache/acct-group/groonga-0
-2206272223 metadata/md5-cache/acct-group/gvm-0-r1
-2206272223 metadata/md5-cache/acct-group/h2o-0
-2206272223 metadata/md5-cache/acct-group/haclient-0
-2206272223 metadata/md5-cache/acct-group/haproxy-0-r1
-2206272223 metadata/md5-cache/acct-group/havp-0
-2206272223 metadata/md5-cache/acct-group/headscale-0
-2206272223 metadata/md5-cache/acct-group/heat-0-r1
-2206272223 metadata/md5-cache/acct-group/hsqldb-0
-2206272223 metadata/md5-cache/acct-group/http-0
-2206272223 metadata/md5-cache/acct-group/i2c-0
-2206272223 metadata/md5-cache/acct-group/i2p-0-r1
-2206272223 metadata/md5-cache/acct-group/i2pd-0-r1
-2206272223 metadata/md5-cache/acct-group/icecast-0
-2206272223 metadata/md5-cache/acct-group/icecream-0
-2206272223 metadata/md5-cache/acct-group/ices-0
-2206272223 metadata/md5-cache/acct-group/icinga-0-r1
-2206272223 metadata/md5-cache/acct-group/icingacmd-0-r1
-2206272223 metadata/md5-cache/acct-group/icingaweb2-0-r1
-2206272223 metadata/md5-cache/acct-group/influxdb-0-r1
-2206272223 metadata/md5-cache/acct-group/input-0-r1
-2206272223 metadata/md5-cache/acct-group/inspircd-0-r1
-2206272223 metadata/md5-cache/acct-group/ipfs-0-r1
-2206272223 metadata/md5-cache/acct-group/ipsec-0
-2206272223 metadata/md5-cache/acct-group/ipsentinel-0
-2206272223 metadata/md5-cache/acct-group/iroffer-0
-2206272223 metadata/md5-cache/acct-group/jabber-0
-2206272223 metadata/md5-cache/acct-group/jenkins-0
-2206272223 metadata/md5-cache/acct-group/kafka-0-r1
-2206272223 metadata/md5-cache/acct-group/kapacitor-0-r1
-2206272223 metadata/md5-cache/acct-group/karma-0
-2206272223 metadata/md5-cache/acct-group/keystone-0-r1
-2206272223 metadata/md5-cache/acct-group/kibana-0-r1
-2206272223 metadata/md5-cache/acct-group/kismet-0-r1
-2206272223 metadata/md5-cache/acct-group/kmem-0-r1
-2206272223 metadata/md5-cache/acct-group/knot-0-r1
-2206272223 metadata/md5-cache/acct-group/kube-apiserver-0-r1
-2206272223 metadata/md5-cache/acct-group/kube-controller-manager-0-r1
-2206272223 metadata/md5-cache/acct-group/kube-scheduler-0-r1
-2206272223 metadata/md5-cache/acct-group/kvm-0-r1
-2206272223 metadata/md5-cache/acct-group/ldap-0
-2206272223 metadata/md5-cache/acct-group/libreoffice-0
-2206272223 metadata/md5-cache/acct-group/libvirt-0-r1
-2206272223 metadata/md5-cache/acct-group/lightdm-0-r1
-2206272223 metadata/md5-cache/acct-group/lighttpd-0-r1
-2206272223 metadata/md5-cache/acct-group/litecoin-0
-2206272223 metadata/md5-cache/acct-group/lldpd-0-r1
-2206272223 metadata/md5-cache/acct-group/locate-0-r1
-2206272223 metadata/md5-cache/acct-group/logcheck-0
-2206272223 metadata/md5-cache/acct-group/logstash-0-r1
-2206272223 metadata/md5-cache/acct-group/logsurfer-0
-2206272223 metadata/md5-cache/acct-group/lp-0-r1
-2206272223 metadata/md5-cache/acct-group/lpadmin-0-r1
-2206272223 metadata/md5-cache/acct-group/lxc-0
-2206272223 metadata/md5-cache/acct-group/lxd-0-r1
-2206272223 metadata/md5-cache/acct-group/mail-0-r1
-2206272223 metadata/md5-cache/acct-group/man-0-r1
-2206272223 metadata/md5-cache/acct-group/maradns-0-r1
-2206272223 metadata/md5-cache/acct-group/memcached-0-r1
-2206272223 metadata/md5-cache/acct-group/memcached_exporter-0
-2206272223 metadata/md5-cache/acct-group/messagebus-0-r1
-2206272223 metadata/md5-cache/acct-group/mgraph-0
-2206272223 metadata/md5-cache/acct-group/milter-regex-0-r1
-2206272223 metadata/md5-cache/acct-group/minbif-0
-2206272223 metadata/md5-cache/acct-group/minecraft-0-r1
-2206272223 metadata/md5-cache/acct-group/minetest-0-r1
-2206272223 metadata/md5-cache/acct-group/minidlna-0
-2206272223 metadata/md5-cache/acct-group/minio-0
-2206272223 metadata/md5-cache/acct-group/mogile-0
-2206272223 metadata/md5-cache/acct-group/mongodb-0-r1
-2206272223 metadata/md5-cache/acct-group/mongodb_exporter-0
-2206272223 metadata/md5-cache/acct-group/monitorix-0-r1
-2206272223 metadata/md5-cache/acct-group/monkeyd-0
-2206272223 metadata/md5-cache/acct-group/monkeysphere-0-r1
-2206272223 metadata/md5-cache/acct-group/mosquitto-0-r1
-2206272223 metadata/md5-cache/acct-group/motion-0-r1
-2206272223 metadata/md5-cache/acct-group/msmtpd-0-r1
-2206272223 metadata/md5-cache/acct-group/munge-0
-2206272223 metadata/md5-cache/acct-group/munin-0-r1
-2206272223 metadata/md5-cache/acct-group/murmur-0-r1
-2206272223 metadata/md5-cache/acct-group/mysql-0-r1
-2206272223 metadata/md5-cache/acct-group/mysqld_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/mythtv-0-r1
-2206272223 metadata/md5-cache/acct-group/nagios-0-r1
-2206272223 metadata/md5-cache/acct-group/named-0-r1
-2206272223 metadata/md5-cache/acct-group/netbox-0-r1
-2206272223 metadata/md5-cache/acct-group/netdata-0-r1
-2206272223 metadata/md5-cache/acct-group/netdev-0-r1
-2206272223 metadata/md5-cache/acct-group/netperf-0
-2206272223 metadata/md5-cache/acct-group/neutron-0-r1
-2206272223 metadata/md5-cache/acct-group/nginx-0-r1
-2206272223 metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/ngircd-0-r1
-2206272223 metadata/md5-cache/acct-group/ngrep-0-r1
-2206272223 metadata/md5-cache/acct-group/nm-openconnect-0
-2206272223 metadata/md5-cache/acct-group/nm-openvpn-0
-2206272223 metadata/md5-cache/acct-group/nobody-0
-2206272223 metadata/md5-cache/acct-group/node_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/nofiles-0-r1
-2206272223 metadata/md5-cache/acct-group/notary-0
-2206272223 metadata/md5-cache/acct-group/nova-0-r1
-2206272223 metadata/md5-cache/acct-group/nsd-0-r1
-2206272223 metadata/md5-cache/acct-group/nslcd-0-r1
-2206272223 metadata/md5-cache/acct-group/ntopng-0
-2206272223 metadata/md5-cache/acct-group/ntp-0-r1
-2206272223 metadata/md5-cache/acct-group/nullmail-0
-2206272223 metadata/md5-cache/acct-group/nut-0
-2206272223 metadata/md5-cache/acct-group/nzbget-0
-2206272223 metadata/md5-cache/acct-group/oidentd-0-r1
-2206272223 metadata/md5-cache/acct-group/openct-0-r1
-2206272223 metadata/md5-cache/acct-group/opendkim-0-r1
-2206272223 metadata/md5-cache/acct-group/opendmarc-1
-2206272223 metadata/md5-cache/acct-group/opendnssec-0
-2206272223 metadata/md5-cache/acct-group/openntpd-0-r1
-2206272223 metadata/md5-cache/acct-group/openrct2-0-r1
-2206272223 metadata/md5-cache/acct-group/openttd-0
-2206272223 metadata/md5-cache/acct-group/openvpn-0-r1
-2206272223 metadata/md5-cache/acct-group/openvpn_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/opm-0
-2206272223 metadata/md5-cache/acct-group/oprofile-0-r1
-2206272223 metadata/md5-cache/acct-group/oragono-0
-2206272223 metadata/md5-cache/acct-group/ossec-0-r1
-2206272223 metadata/md5-cache/acct-group/p2p-0
-2206272223 metadata/md5-cache/acct-group/partimag-0-r1
-2206272223 metadata/md5-cache/acct-group/pcap-0
-2206272223 metadata/md5-cache/acct-group/pcscd-0-r1
-2206272223 metadata/md5-cache/acct-group/pdns-0-r1
-2206272223 metadata/md5-cache/acct-group/pdnsd-0-r1
-2206272223 metadata/md5-cache/acct-group/pgagent-0
-2206272223 metadata/md5-cache/acct-group/pipewire-0
-2206272223 metadata/md5-cache/acct-group/pkcs11-0
-2206272223 metadata/md5-cache/acct-group/placement-0-r1
-2206272223 metadata/md5-cache/acct-group/plex-0-r1
-2206272223 metadata/md5-cache/acct-group/plugdev-0-r1
-2206272223 metadata/md5-cache/acct-group/polkitd-0-r1
-2206272223 metadata/md5-cache/acct-group/polw-0
-2206272223 metadata/md5-cache/acct-group/popa3d-0
-2206272223 metadata/md5-cache/acct-group/portage-0
-2206272223 metadata/md5-cache/acct-group/postdrop-0-r1
-2206272223 metadata/md5-cache/acct-group/postfix-0-r1
-2206272223 metadata/md5-cache/acct-group/postfix_exporter-0-r1
-2206272223 metadata/md5-cache/acct-group/postfwd-0
-2206272223 metadata/md5-cache/acct-group/postgres-0-r1
-2206272223 metadata/md5-cache/acct-group/postgres_exporter-0
-2206272223 metadata/md5-cache/acct-group/postgrey-0
-2206272223 metadata/md5-cache/acct-group/privoxy-0-r1
-2206272223 metadata/md5-cache/acct-group/prometheus-0-r1
-2206272223 metadata/md5-cache/acct-group/prosody-0
-2206272223 metadata/md5-cache/acct-group/psybnc-0
-2206272223 metadata/md5-cache/acct-group/pulse-0
-2206272223 metadata/md5-cache/acct-group/pulse-access-0
-2206272223 metadata/md5-cache/acct-group/puppet-0-r1
-2206272223 metadata/md5-cache/acct-group/puppetdb-0-r1
-2206272223 metadata/md5-cache/acct-group/pushgateway-0
-2206272223 metadata/md5-cache/acct-group/pvpgn-0
-2206272223 metadata/md5-cache/acct-group/qemu-0-r1
-2206272223 metadata/md5-cache/acct-group/qmail-0-r1
-2206272223 metadata/md5-cache/acct-group/quagga-0-r1
-2206272223 metadata/md5-cache/acct-group/quassel-0-r1
-2206272223 metadata/md5-cache/acct-group/rabbitmq-0
-2206272223 metadata/md5-cache/acct-group/rabbitmq_exporter-0
-2206272223 metadata/md5-cache/acct-group/radicale-0-r1
-2206272223 metadata/md5-cache/acct-group/radius-0-r1
-2206272223 metadata/md5-cache/acct-group/radvd-0
-2206272223 metadata/md5-cache/acct-group/rbldns-0-r1
-2206272223 metadata/md5-cache/acct-group/rbot-0
-2206272223 metadata/md5-cache/acct-group/realtime-0
-2206272223 metadata/md5-cache/acct-group/redis-0-r1
-2206272223 metadata/md5-cache/acct-group/redis_exporter-0
-2206272223 metadata/md5-cache/acct-group/redmine-0-r1
-2206272223 metadata/md5-cache/acct-group/redsocks-0-r1
-2206272223 metadata/md5-cache/acct-group/reg-0-r1
-2206272223 metadata/md5-cache/acct-group/registry-0
-2206272223 metadata/md5-cache/acct-group/render-0-r1
-2206272223 metadata/md5-cache/acct-group/resin-0
-2206272223 metadata/md5-cache/acct-group/roccat-0
-2206272223 metadata/md5-cache/acct-group/root-0
-2206272223 metadata/md5-cache/acct-group/ros-0
-2206272223 metadata/md5-cache/acct-group/rplayd-0
-2206272223 metadata/md5-cache/acct-group/rrdcached-0
-2206272223 metadata/md5-cache/acct-group/rslsync-0
-2206272223 metadata/md5-cache/acct-group/rspamd-0-r1
-2206272223 metadata/md5-cache/acct-group/rstudio-server-0-r1
-2206272223 metadata/md5-cache/acct-group/rt-0-r1
-2206272223 metadata/md5-cache/acct-group/rtkit-0-r1
-2206272223 metadata/md5-cache/acct-group/rundeck-0
-2206272223 metadata/md5-cache/acct-group/rwhoisd-0
-2206272223 metadata/md5-cache/acct-group/sabnzbd-0-r1
-2206272223 metadata/md5-cache/acct-group/sagan-0
-2206272223 metadata/md5-cache/acct-group/samplicator-0
-2206272223 metadata/md5-cache/acct-group/sancp-0
-2206272223 metadata/md5-cache/acct-group/sanlock-0-r1
-2206272223 metadata/md5-cache/acct-group/sauerbraten-0-r1
-2206272223 metadata/md5-cache/acct-group/scanlogd-0
-2206272223 metadata/md5-cache/acct-group/scanner-0
-2206272223 metadata/md5-cache/acct-group/scponly-0-r1
-2206272223 metadata/md5-cache/acct-group/scsi-0
-2206272223 metadata/md5-cache/acct-group/sddm-0
-2206272223 metadata/md5-cache/acct-group/seat-0
-2206272223 metadata/md5-cache/acct-group/serf-0
-2206272223 metadata/md5-cache/acct-group/sguil-0
-2206272223 metadata/md5-cache/acct-group/sgx-0
-2206272223 metadata/md5-cache/acct-group/shellinaboxd-0-r1
-2206272223 metadata/md5-cache/acct-group/sigh-0
-2206272223 metadata/md5-cache/acct-group/simplevirt-0-r1
-2206272223 metadata/md5-cache/acct-group/sispmctl-0
-2206272223 metadata/md5-cache/acct-group/sks-0
-2206272223 metadata/md5-cache/acct-group/slurm-0-r1
-2206272223 metadata/md5-cache/acct-group/smmsp-0-r1
-2206272223 metadata/md5-cache/acct-group/smokeping-0
-2206272223 metadata/md5-cache/acct-group/sms-0
-2206272223 metadata/md5-cache/acct-group/smtpd-0-r1
-2206272223 metadata/md5-cache/acct-group/smtpq-0-r1
-2206272223 metadata/md5-cache/acct-group/snapserver-0
-2206272223 metadata/md5-cache/acct-group/sniproxy-0
-2206272223 metadata/md5-cache/acct-group/snmp_exporter-0
-2206272223 metadata/md5-cache/acct-group/snort-0
-2206272223 metadata/md5-cache/acct-group/sobby-0
-2206272223 metadata/md5-cache/acct-group/sobexsrv-0
-2206272223 metadata/md5-cache/acct-group/sockd-0
-2206272223 metadata/md5-cache/acct-group/sogo-0-r1
-2206272223 metadata/md5-cache/acct-group/spamd-0-r1
-2206272223 metadata/md5-cache/acct-group/spectrum-0-r1
-2206272223 metadata/md5-cache/acct-group/spi-0
-2206272223 metadata/md5-cache/acct-group/spire-0-r1
-2206272223 metadata/md5-cache/acct-group/spread-0
-2206272223 metadata/md5-cache/acct-group/sqlgrey-0-r1
-2206272223 metadata/md5-cache/acct-group/squid-0-r1
-2206272223 metadata/md5-cache/acct-group/sshd-0-r1
-2206272223 metadata/md5-cache/acct-group/ssmtp-0
-2206272223 metadata/md5-cache/acct-group/sstpc-0
-2206272223 metadata/md5-cache/acct-group/stapdev-0
-2206272223 metadata/md5-cache/acct-group/stapsys-0
-2206272223 metadata/md5-cache/acct-group/stapusr-0
-2206272223 metadata/md5-cache/acct-group/steamcmd-0-r1
-2206272223 metadata/md5-cache/acct-group/stg-0
-2206272223 metadata/md5-cache/acct-group/stubby-0-r1
-2206272223 metadata/md5-cache/acct-group/stunnel-0-r1
-2206272223 metadata/md5-cache/acct-group/subsonic-0
-2206272223 metadata/md5-cache/acct-group/supervisor-0-r1
-2206272223 metadata/md5-cache/acct-group/suricata-0-r1
-2206272223 metadata/md5-cache/acct-group/svnusers-0-r1
-2206272223 metadata/md5-cache/acct-group/svxlink-0
-2206272223 metadata/md5-cache/acct-group/swift-0-r1
-2206272223 metadata/md5-cache/acct-group/syncthing-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-coredump-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-hostname-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-journal-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-network-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-oom-0
-2206272223 metadata/md5-cache/acct-group/systemd-resolve-0-r1
-2206272223 metadata/md5-cache/acct-group/systemd-timesync-0-r1
-2206272223 metadata/md5-cache/acct-group/tape-0-r1
-2206272223 metadata/md5-cache/acct-group/taskd-0
-2206272223 metadata/md5-cache/acct-group/teamspeak-0-r1
-2206272223 metadata/md5-cache/acct-group/telegraf-0-r1
-2206272223 metadata/md5-cache/acct-group/tenshi-0
-2206272223 metadata/md5-cache/acct-group/thttpd-0
-2206272223 metadata/md5-cache/acct-group/tinyproxy-0
-2206272223 metadata/md5-cache/acct-group/tomcat-0
-2206272223 metadata/md5-cache/acct-group/tor-0-r1
-2206272223 metadata/md5-cache/acct-group/tox-0-r1
-2206272223 metadata/md5-cache/acct-group/tpm-0
-2206272223 metadata/md5-cache/acct-group/transmission-0-r1
-2206272223 metadata/md5-cache/acct-group/trickster-0
-2206272223 metadata/md5-cache/acct-group/trojan-0
-2206272223 metadata/md5-cache/acct-group/tsm-0-r1
-2206272223 metadata/md5-cache/acct-group/tss-0-r1
-2206272223 metadata/md5-cache/acct-group/ttrssd-0
-2206272223 metadata/md5-cache/acct-group/tty-0-r1
-2206272223 metadata/md5-cache/acct-group/turnserver-0-r1
-2206272223 metadata/md5-cache/acct-group/ubridge-0-r1
-2206272223 metadata/md5-cache/acct-group/ulogd-0
-2206272223 metadata/md5-cache/acct-group/ultimaker-0-r1
-2206272223 metadata/md5-cache/acct-group/unbound-0-r1
-2206272223 metadata/md5-cache/acct-group/unbound-telemetry-0
-2206272223 metadata/md5-cache/acct-group/unifi-0-r1
-2206272223 metadata/md5-cache/acct-group/unifi-video-0
-2206272223 metadata/md5-cache/acct-group/unrealircd-0-r1
-2206272223 metadata/md5-cache/acct-group/upmpdcli-0
-2206272223 metadata/md5-cache/acct-group/usb-0-r1
-2206272223 metadata/md5-cache/acct-group/users-0
-2206272223 metadata/md5-cache/acct-group/ushare-0
-2206272223 metadata/md5-cache/acct-group/utmp-0-r1
-2206272223 metadata/md5-cache/acct-group/uucp-0-r1
-2206272223 metadata/md5-cache/acct-group/uwsgi_exporter-0
-2206272223 metadata/md5-cache/acct-group/vacation-0
-2206272223 metadata/md5-cache/acct-group/varnish-0-r1
-2206272223 metadata/md5-cache/acct-group/vault-0-r1
-2206272223 metadata/md5-cache/acct-group/vault_exporter-0
-2206272223 metadata/md5-cache/acct-group/vboxguest-0-r1
-2206272223 metadata/md5-cache/acct-group/vboxsf-0-r1
-2206272223 metadata/md5-cache/acct-group/vboxusers-0-r1
-2206272223 metadata/md5-cache/acct-group/vdr-0-r1
-2206272223 metadata/md5-cache/acct-group/vdradmin-0-r1
-2206272223 metadata/md5-cache/acct-group/video-0-r1
-2206272223 metadata/md5-cache/acct-group/vlock-0
-2206272223 metadata/md5-cache/acct-group/vnstat-0
-2206272223 metadata/md5-cache/acct-group/vpopmail-0-r1
-2206272223 metadata/md5-cache/acct-group/wesnoth-0-r1
-2206272223 metadata/md5-cache/acct-group/wheel-0-r1
-2206272223 metadata/md5-cache/acct-group/wwwoffle-0
-2206272223 metadata/md5-cache/acct-group/x2goprint-0-r1
-2206272223 metadata/md5-cache/acct-group/x2gouser-0-r1
-2206272223 metadata/md5-cache/acct-group/xpra-0
-2206272223 metadata/md5-cache/acct-group/xrootd-0-r1
-2206272223 metadata/md5-cache/acct-group/xwax-0
-2206272223 metadata/md5-cache/acct-group/zabbix-0
-2206272223 metadata/md5-cache/acct-group/zeppelin-0-r1
-2206272223 metadata/md5-cache/acct-group/zetcd-0
-2206272223 metadata/md5-cache/acct-group/ziproxy-0
-2206272223 metadata/md5-cache/acct-group/znc-0-r1
-2206272223 metadata/md5-cache/acct-group/zookeeper-0
-2206300140 metadata/md5-cache/acct-group/Manifest.gz
-2206300140 metadata/md5-cache/acct-group/uptimed-0-r2
-2206272223 metadata/md5-cache/acct-user/abrt-0-r1
-2206272223 metadata/md5-cache/acct-user/aerospike-amc-0
-2206272223 metadata/md5-cache/acct-user/airdcppd-0-r1
-2206272223 metadata/md5-cache/acct-user/alertmanager-0
-2206272223 metadata/md5-cache/acct-user/alias-0-r1
-2206272223 metadata/md5-cache/acct-user/amanda-0
-2206272223 metadata/md5-cache/acct-user/amavis-0-r1
-2206272223 metadata/md5-cache/acct-user/amule-0-r1
-2206272223 metadata/md5-cache/acct-user/anope-0-r1
-2206272223 metadata/md5-cache/acct-user/apache-0-r2
-2206272223 metadata/md5-cache/acct-user/apt-cacher-ng-0
-2206272223 metadata/md5-cache/acct-user/argus-0
-2206272223 metadata/md5-cache/acct-user/arpwatch-0
-2206272223 metadata/md5-cache/acct-user/artifactory-0
-2206272223 metadata/md5-cache/acct-user/aspnet-0
-2206272223 metadata/md5-cache/acct-user/asterisk-0-r1
-2206272223 metadata/md5-cache/acct-user/at-0
-2206272223 metadata/md5-cache/acct-user/atheme-services-0-r1
-2206272223 metadata/md5-cache/acct-user/automatic-0
-2206272223 metadata/md5-cache/acct-user/automx2-0-r1
-2206272223 metadata/md5-cache/acct-user/avahi-0-r1
-2206272223 metadata/md5-cache/acct-user/avahi-autoipd-0-r1
-2206272223 metadata/md5-cache/acct-user/axtls-0
-2206272223 metadata/md5-cache/acct-user/backuppc-0
-2206272223 metadata/md5-cache/acct-user/bacula-0-r1
-2206272223 metadata/md5-cache/acct-user/bareos-0-r1
-2206272223 metadata/md5-cache/acct-user/beanstalk-0
-2206272223 metadata/md5-cache/acct-user/bedrock-0-r1
-2206272223 metadata/md5-cache/acct-user/biboumi-0
-2206272223 metadata/md5-cache/acct-user/bind_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/bird-0
-2206272223 metadata/md5-cache/acct-user/bitcoin-0-r1
-2206272223 metadata/md5-cache/acct-user/bitflu-0
-2206272223 metadata/md5-cache/acct-user/bitlbee-0-r1
-2206272223 metadata/md5-cache/acct-user/blackbox_exporter-0
-2206272223 metadata/md5-cache/acct-user/boinc-0
-2206272223 metadata/md5-cache/acct-user/brltty-0
-2206272223 metadata/md5-cache/acct-user/buildbot-0-r1
-2206272223 metadata/md5-cache/acct-user/burp-0-r1
-2206272223 metadata/md5-cache/acct-user/burrow_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/cadvisor-0-r1
-2206272223 metadata/md5-cache/acct-user/cancd-0-r1
-2206272223 metadata/md5-cache/acct-user/carbon-0-r1
-2206272223 metadata/md5-cache/acct-user/ceph-0-r1
-2206272223 metadata/md5-cache/acct-user/cgit-0
-2206272223 metadata/md5-cache/acct-user/chronograf-0-r1
-2206272223 metadata/md5-cache/acct-user/cinder-0-r1
-2206272223 metadata/md5-cache/acct-user/clair-0-r1
-2206272223 metadata/md5-cache/acct-user/clamav-0-r1
-2206272223 metadata/md5-cache/acct-user/cmd5checkpw-0-r1
-2206272223 metadata/md5-cache/acct-user/cntlm-0
-2206272223 metadata/md5-cache/acct-user/cockroach-0
-2206272223 metadata/md5-cache/acct-user/collectd-0
-2206272223 metadata/md5-cache/acct-user/colord-0
-2206272223 metadata/md5-cache/acct-user/consul-0-r1
-2206272223 metadata/md5-cache/acct-user/consul-template-0-r1
-2206272223 metadata/md5-cache/acct-user/consul_exporter-0
-2206272223 metadata/md5-cache/acct-user/coredns-0
-2206272223 metadata/md5-cache/acct-user/croc-0
-2206272223 metadata/md5-cache/acct-user/cron-0
-2206272223 metadata/md5-cache/acct-user/cvmfs-0-r1
-2206272223 metadata/md5-cache/acct-user/cyrus-0-r2
-2206272223 metadata/md5-cache/acct-user/darkstat-0
-2206272223 metadata/md5-cache/acct-user/davfs2-0-r1
-2206272223 metadata/md5-cache/acct-user/dbmail-0
-2206272223 metadata/md5-cache/acct-user/dbskkd-0
-2206272223 metadata/md5-cache/acct-user/ddclient-0-r1
-2206272223 metadata/md5-cache/acct-user/defang-0
-2206272223 metadata/md5-cache/acct-user/dehydrated-0
-2206272223 metadata/md5-cache/acct-user/deluge-0-r1
-2206272223 metadata/md5-cache/acct-user/dhcp-0-r1
-2206272223 metadata/md5-cache/acct-user/dhcpcd-0-r1
-2206272223 metadata/md5-cache/acct-user/dictd-0
-2206272223 metadata/md5-cache/acct-user/dirsrv-0
-2206272223 metadata/md5-cache/acct-user/distcc-1
-2206272223 metadata/md5-cache/acct-user/dnrd-0
-2206272223 metadata/md5-cache/acct-user/dnscache-0
-2206272223 metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
-2206272223 metadata/md5-cache/acct-user/dnsdist-0-r1
-2206272223 metadata/md5-cache/acct-user/dnslog-0
-2206272223 metadata/md5-cache/acct-user/dnsmasq-0-r1
-2206272223 metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/docker_auth-0-r1
-2206272223 metadata/md5-cache/acct-user/dovecot-0-r1
-2206272223 metadata/md5-cache/acct-user/dovenull-0-r1
-2206272223 metadata/md5-cache/acct-user/drone-0
-2206272223 metadata/md5-cache/acct-user/duende-0-r1
-2206272223 metadata/md5-cache/acct-user/ejabberd-0
-2206272223 metadata/md5-cache/acct-user/ejabberd-1
-2206272223 metadata/md5-cache/acct-user/elasticsearch-0-r1
-2206272223 metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/energi3-0
-2206272223 metadata/md5-cache/acct-user/epmd-0-r1
-2206272223 metadata/md5-cache/acct-user/err-0
-2206272223 metadata/md5-cache/acct-user/etcd-0-r1
-2206272223 metadata/md5-cache/acct-user/exabgp-0-r1
-2206272223 metadata/md5-cache/acct-user/ez-ipupd-0
-2206272223 metadata/md5-cache/acct-user/fax-0
-2206272223 metadata/md5-cache/acct-user/fcron-0
-2206272223 metadata/md5-cache/acct-user/fdm-0
-2206272223 metadata/md5-cache/acct-user/fetchmail-0-r1
-2206272223 metadata/md5-cache/acct-user/fhem-0-r1
-2206272223 metadata/md5-cache/acct-user/firebird-0-r1
-2206272223 metadata/md5-cache/acct-user/flatpak-0
-2206272223 metadata/md5-cache/acct-user/flows-0
-2206272223 metadata/md5-cache/acct-user/fluentd-0-r1
-2206272223 metadata/md5-cache/acct-user/fnord-0
-2206272223 metadata/md5-cache/acct-user/fnordlog-0
-2206272223 metadata/md5-cache/acct-user/foldingathome-0
-2206272223 metadata/md5-cache/acct-user/fp-multiuser-0
-2206272223 metadata/md5-cache/acct-user/freenet-0
-2206272223 metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
-2206272223 metadata/md5-cache/acct-user/frr-0
-2206272223 metadata/md5-cache/acct-user/ftp-0-r3
-2206272223 metadata/md5-cache/acct-user/ftpproxy-0
-2206272223 metadata/md5-cache/acct-user/gatling-0-r1
-2206272223 metadata/md5-cache/acct-user/gauth-0
-2206272223 metadata/md5-cache/acct-user/gdm-0
-2206272223 metadata/md5-cache/acct-user/geneweb-0-r1
-2206272223 metadata/md5-cache/acct-user/geoclue-0
-2206272223 metadata/md5-cache/acct-user/gerbera-0-r1
-2206272223 metadata/md5-cache/acct-user/git-0-r2
-2206272223 metadata/md5-cache/acct-user/github-exporter-0
-2206272223 metadata/md5-cache/acct-user/gitlab-runner-1
-2206272223 metadata/md5-cache/acct-user/gkrellmd-0-r1
-2206272223 metadata/md5-cache/acct-user/glance-0-r1
-2206272223 metadata/md5-cache/acct-user/gluster-0-r1
-2206272223 metadata/md5-cache/acct-user/gnump3d-0
-2206272223 metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
-2206272223 metadata/md5-cache/acct-user/gopher-0
-2206272223 metadata/md5-cache/acct-user/gopherd-0
-2206272223 metadata/md5-cache/acct-user/gpsd-0-r2
-2206272223 metadata/md5-cache/acct-user/grafana-0-r1
-2206272223 metadata/md5-cache/acct-user/graylog-0-r1
-2206272223 metadata/md5-cache/acct-user/greetd-0-r1
-2206272223 metadata/md5-cache/acct-user/grok_exporter-0
-2206272223 metadata/md5-cache/acct-user/groonga-0
-2206272223 metadata/md5-cache/acct-user/gvm-0-r1
-2206272223 metadata/md5-cache/acct-user/h2o-0
-2206272223 metadata/md5-cache/acct-user/hacluster-0
-2206272223 metadata/md5-cache/acct-user/haproxy-0-r1
-2206272223 metadata/md5-cache/acct-user/havp-0
-2206272223 metadata/md5-cache/acct-user/headscale-0
-2206272223 metadata/md5-cache/acct-user/heat-0-r1
-2206272223 metadata/md5-cache/acct-user/hsqldb-0
-2206272223 metadata/md5-cache/acct-user/http-0
-2206272223 metadata/md5-cache/acct-user/i2p-0-r1
-2206272223 metadata/md5-cache/acct-user/i2pd-0-r1
-2206272223 metadata/md5-cache/acct-user/icecast-0
-2206272223 metadata/md5-cache/acct-user/icecream-0
-2206272223 metadata/md5-cache/acct-user/ices-0
-2206272223 metadata/md5-cache/acct-user/icinga-0-r1
-2206272223 metadata/md5-cache/acct-user/icingadirector-0
-2206272223 metadata/md5-cache/acct-user/influxdb-0-r1
-2206272223 metadata/md5-cache/acct-user/inspircd-0-r1
-2206272223 metadata/md5-cache/acct-user/ipfs-0-r1
-2206272223 metadata/md5-cache/acct-user/ippl-0-r1
-2206272223 metadata/md5-cache/acct-user/ipsec-0
-2206272223 metadata/md5-cache/acct-user/ipsentinel-0
-2206272223 metadata/md5-cache/acct-user/iroffer-0
-2206272223 metadata/md5-cache/acct-user/jabber-0
-2206272223 metadata/md5-cache/acct-user/jenkins-0
-2206272223 metadata/md5-cache/acct-user/kafka-0-r1
-2206272223 metadata/md5-cache/acct-user/kapacitor-0-r1
-2206272223 metadata/md5-cache/acct-user/karma-0
-2206272223 metadata/md5-cache/acct-user/keystone-0-r1
-2206272223 metadata/md5-cache/acct-user/kibana-0-r1
-2206272223 metadata/md5-cache/acct-user/kismet-0-r1
-2206272223 metadata/md5-cache/acct-user/knot-0-r1
-2206272223 metadata/md5-cache/acct-user/kube-apiserver-0-r1
-2206272223 metadata/md5-cache/acct-user/kube-controller-manager-0-r1
-2206272223 metadata/md5-cache/acct-user/kube-scheduler-0-r1
-2206272223 metadata/md5-cache/acct-user/ldap-0
-2206272223 metadata/md5-cache/acct-user/libreoffice-0
-2206272223 metadata/md5-cache/acct-user/lightdm-0
-2206272223 metadata/md5-cache/acct-user/lighttpd-0-r1
-2206272223 metadata/md5-cache/acct-user/litecoin-0
-2206272223 metadata/md5-cache/acct-user/lldpd-0-r1
-2206272223 metadata/md5-cache/acct-user/logcheck-0
-2206272223 metadata/md5-cache/acct-user/logstash-0-r1
-2206272223 metadata/md5-cache/acct-user/logsurfer-0
-2206272223 metadata/md5-cache/acct-user/lxc-0
-2206272223 metadata/md5-cache/acct-user/mail-0-r1
-2206272223 metadata/md5-cache/acct-user/man-1-r1
-2206272223 metadata/md5-cache/acct-user/maradns-0-r1
-2206272223 metadata/md5-cache/acct-user/memcached-0-r1
-2206272223 metadata/md5-cache/acct-user/memcached_exporter-0
-2206272223 metadata/md5-cache/acct-user/messagebus-0-r1
-2206272223 metadata/md5-cache/acct-user/mgraph-0
-2206272223 metadata/md5-cache/acct-user/milter-regex-0-r1
-2206272223 metadata/md5-cache/acct-user/minbif-0
-2206272223 metadata/md5-cache/acct-user/minecraft-0-r1
-2206272223 metadata/md5-cache/acct-user/minetest-1-r1
-2206272223 metadata/md5-cache/acct-user/minidlna-0
-2206272223 metadata/md5-cache/acct-user/miniflux-0
-2206272223 metadata/md5-cache/acct-user/minio-0
-2206272223 metadata/md5-cache/acct-user/mogile-0
-2206272223 metadata/md5-cache/acct-user/mongodb-0-r1
-2206272223 metadata/md5-cache/acct-user/mongodb_exporter-0
-2206272223 metadata/md5-cache/acct-user/monitorix-0-r1
-2206272223 metadata/md5-cache/acct-user/monkeyd-0
-2206272223 metadata/md5-cache/acct-user/monkeysphere-0-r1
-2206272223 metadata/md5-cache/acct-user/mosquitto-0-r1
-2206272223 metadata/md5-cache/acct-user/motion-0-r1
-2206272223 metadata/md5-cache/acct-user/mpd-0-r1
-2206272223 metadata/md5-cache/acct-user/msmtpd-0-r1
-2206272223 metadata/md5-cache/acct-user/munge-0
-2206272223 metadata/md5-cache/acct-user/munin-0-r1
-2206272223 metadata/md5-cache/acct-user/munin-async-0-r1
-2206272223 metadata/md5-cache/acct-user/murmur-0-r1
-2206272223 metadata/md5-cache/acct-user/mysql-0-r1
-2206272223 metadata/md5-cache/acct-user/mysqld_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/mythtv-0-r1
-2206272223 metadata/md5-cache/acct-user/nagios-0-r1
-2206272223 metadata/md5-cache/acct-user/named-0-r1
-2206272223 metadata/md5-cache/acct-user/netbox-0-r1
-2206272223 metadata/md5-cache/acct-user/netdata-1
-2206272223 metadata/md5-cache/acct-user/netperf-0
-2206272223 metadata/md5-cache/acct-user/neutron-0-r1
-2206272223 metadata/md5-cache/acct-user/nginx-0
-2206272223 metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/ngircd-0-r1
-2206272223 metadata/md5-cache/acct-user/ngrep-0-r1
-2206272223 metadata/md5-cache/acct-user/nm-openconnect-0
-2206272223 metadata/md5-cache/acct-user/nm-openvpn-0
-2206272223 metadata/md5-cache/acct-user/nobody-0
-2206272223 metadata/md5-cache/acct-user/node_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/notary-0
-2206272223 metadata/md5-cache/acct-user/nova-0-r1
-2206272223 metadata/md5-cache/acct-user/nsd-0-r1
-2206272223 metadata/md5-cache/acct-user/nslcd-0-r1
-2206272223 metadata/md5-cache/acct-user/ntopng-0
-2206272223 metadata/md5-cache/acct-user/ntp-0-r1
-2206272223 metadata/md5-cache/acct-user/nullmail-0
-2206272223 metadata/md5-cache/acct-user/nut-0-r1
-2206272223 metadata/md5-cache/acct-user/nvpd-0
-2206272223 metadata/md5-cache/acct-user/nzbget-0
-2206272223 metadata/md5-cache/acct-user/oidentd-0-r1
-2206272223 metadata/md5-cache/acct-user/openctd-0
-2206272223 metadata/md5-cache/acct-user/opendkim-0-r1
-2206272223 metadata/md5-cache/acct-user/opendmarc-0
-2206272223 metadata/md5-cache/acct-user/opendnssec-0
-2206272223 metadata/md5-cache/acct-user/openntpd-0-r1
-2206272223 metadata/md5-cache/acct-user/openrct2-0-r1
-2206272223 metadata/md5-cache/acct-user/openttd-0
-2206272223 metadata/md5-cache/acct-user/openvpn-0-r1
-2206272223 metadata/md5-cache/acct-user/openvpn_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/opm-0-r1
-2206272223 metadata/md5-cache/acct-user/oprofile-0-r1
-2206272223 metadata/md5-cache/acct-user/oragono-0
-2206272223 metadata/md5-cache/acct-user/ossec-0-r1
-2206272223 metadata/md5-cache/acct-user/ossecm-0-r1
-2206272223 metadata/md5-cache/acct-user/ossecr-0-r1
-2206272223 metadata/md5-cache/acct-user/p2p-0
-2206272223 metadata/md5-cache/acct-user/partimag-0
-2206272223 metadata/md5-cache/acct-user/pcap-0
-2206272223 metadata/md5-cache/acct-user/pcscd-0-r1
-2206272223 metadata/md5-cache/acct-user/pdns-0-r1
-2206272223 metadata/md5-cache/acct-user/pdnsd-0-r1
-2206272223 metadata/md5-cache/acct-user/pgagent-0
-2206272223 metadata/md5-cache/acct-user/pgbouncer-0
-2206272223 metadata/md5-cache/acct-user/pgpool-0
-2206272223 metadata/md5-cache/acct-user/pipewire-0
-2206272223 metadata/md5-cache/acct-user/placement-0-r1
-2206272223 metadata/md5-cache/acct-user/plex-0-r1
-2206272223 metadata/md5-cache/acct-user/polkitd-0-r1
-2206272223 metadata/md5-cache/acct-user/polw-0
-2206272223 metadata/md5-cache/acct-user/popa3d-0
-2206272223 metadata/md5-cache/acct-user/portage-0
-2206272223 metadata/md5-cache/acct-user/postfix-0-r1
-2206272223 metadata/md5-cache/acct-user/postfix_exporter-0-r1
-2206272223 metadata/md5-cache/acct-user/postfwd-0
-2206272223 metadata/md5-cache/acct-user/postgres-0-r1
-2206272223 metadata/md5-cache/acct-user/postgres_exporter-0
-2206272223 metadata/md5-cache/acct-user/postgrey-0
-2206272223 metadata/md5-cache/acct-user/postmaster-0-r1
-2206272223 metadata/md5-cache/acct-user/privoxy-0-r1
-2206272223 metadata/md5-cache/acct-user/prometheus-0-r1
-2206272223 metadata/md5-cache/acct-user/prosody-0
-2206272223 metadata/md5-cache/acct-user/psybnc-0
-2206272223 metadata/md5-cache/acct-user/pulse-0
-2206272223 metadata/md5-cache/acct-user/puppet-0-r1
-2206272223 metadata/md5-cache/acct-user/puppetdb-0-r1
-2206272223 metadata/md5-cache/acct-user/pushgateway-0
-2206272223 metadata/md5-cache/acct-user/pvpgn-0
-2206272223 metadata/md5-cache/acct-user/qemu-0-r1
-2206272223 metadata/md5-cache/acct-user/qmaild-0-r1
-2206272223 metadata/md5-cache/acct-user/qmaill-0-r1
-2206272223 metadata/md5-cache/acct-user/qmailp-0-r1
-2206272223 metadata/md5-cache/acct-user/qmailq-0-r1
-2206272223 metadata/md5-cache/acct-user/qmailr-0-r1
-2206272223 metadata/md5-cache/acct-user/qmails-0-r1
-2206272223 metadata/md5-cache/acct-user/quagga-0-r1
-2206272223 metadata/md5-cache/acct-user/quassel-0-r1
-2206272223 metadata/md5-cache/acct-user/rabbitmq-0
-2206272223 metadata/md5-cache/acct-user/rabbitmq_exporter-0
-2206272223 metadata/md5-cache/acct-user/radicale-0-r2
-2206272223 metadata/md5-cache/acct-user/radius-0-r1
-2206272223 metadata/md5-cache/acct-user/radvd-0
-2206272223 metadata/md5-cache/acct-user/rbldns-0-r1
-2206272223 metadata/md5-cache/acct-user/rbot-0
-2206272223 metadata/md5-cache/acct-user/redis-0-r1
-2206272223 metadata/md5-cache/acct-user/redis_exporter-0
-2206272223 metadata/md5-cache/acct-user/redmine-0-r1
-2206272223 metadata/md5-cache/acct-user/redsocks-0-r1
-2206272223 metadata/md5-cache/acct-user/reg-0-r1
-2206272223 metadata/md5-cache/acct-user/registry-0
-2206272223 metadata/md5-cache/acct-user/root-0-r1
-2206272223 metadata/md5-cache/acct-user/ros-0
-2206272223 metadata/md5-cache/acct-user/rplayd-0
-2206272223 metadata/md5-cache/acct-user/rrdcached-0
-2206272223 metadata/md5-cache/acct-user/rslsync-0
-2206272223 metadata/md5-cache/acct-user/rspamd-0-r1
-2206272223 metadata/md5-cache/acct-user/rstudio-server-0-r1
-2206272223 metadata/md5-cache/acct-user/rt-0
-2206272223 metadata/md5-cache/acct-user/rtkit-0-r1
-2206272223 metadata/md5-cache/acct-user/rundeck-0
-2206272223 metadata/md5-cache/acct-user/rwhoisd-0
-2206272223 metadata/md5-cache/acct-user/sabnzbd-0-r1
-2206272223 metadata/md5-cache/acct-user/sagan-0-r1
-2206272223 metadata/md5-cache/acct-user/samplicator-0
-2206272223 metadata/md5-cache/acct-user/sancp-0
-2206272223 metadata/md5-cache/acct-user/saned-0
-2206272223 metadata/md5-cache/acct-user/sanlock-0-r1
-2206272223 metadata/md5-cache/acct-user/sauerbraten-0-r1
-2206272223 metadata/md5-cache/acct-user/scanlogd-0
-2206272223 metadata/md5-cache/acct-user/scponly-0-r1
-2206272223 metadata/md5-cache/acct-user/sddm-0
-2206272223 metadata/md5-cache/acct-user/sendpage-0
-2206272223 metadata/md5-cache/acct-user/serf-0
-2206272223 metadata/md5-cache/acct-user/sguil-0
-2206272223 metadata/md5-cache/acct-user/shellinaboxd-0-r1
-2206272223 metadata/md5-cache/acct-user/sigh-0
-2206272223 metadata/md5-cache/acct-user/sks-0
-2206272223 metadata/md5-cache/acct-user/slurm-0-r1
-2206272223 metadata/md5-cache/acct-user/smmsp-0-r2
-2206272223 metadata/md5-cache/acct-user/smokeping-0
-2206272223 metadata/md5-cache/acct-user/smsd-0
-2206272223 metadata/md5-cache/acct-user/smtpd-0-r1
-2206272223 metadata/md5-cache/acct-user/smtpq-0-r1
-2206272223 metadata/md5-cache/acct-user/snapclient-0
-2206272223 metadata/md5-cache/acct-user/snapserver-0
-2206272223 metadata/md5-cache/acct-user/sndiod-0
-2206272223 metadata/md5-cache/acct-user/sniproxy-0
-2206272223 metadata/md5-cache/acct-user/snmp_exporter-0
-2206272223 metadata/md5-cache/acct-user/snort-0
-2206272223 metadata/md5-cache/acct-user/sobby-0
-2206272223 metadata/md5-cache/acct-user/sobexsrv-0
-2206272223 metadata/md5-cache/acct-user/sockd-0-r1
-2206272223 metadata/md5-cache/acct-user/sogo-0-r1
-2206272223 metadata/md5-cache/acct-user/spamd-0-r1
-2206272223 metadata/md5-cache/acct-user/spectrum-0-r1
-2206272223 metadata/md5-cache/acct-user/spire-0-r1
-2206272223 metadata/md5-cache/acct-user/spread-0
-2206272223 metadata/md5-cache/acct-user/sqlgrey-0-r1
-2206272223 metadata/md5-cache/acct-user/squid-0-r1
-2206272223 metadata/md5-cache/acct-user/sshd-0-r1
-2206272223 metadata/md5-cache/acct-user/sstpc-0
-2206272223 metadata/md5-cache/acct-user/stdiscosrv-1
-2206272223 metadata/md5-cache/acct-user/steamcmd-0-r1
-2206272223 metadata/md5-cache/acct-user/stg-0
-2206272223 metadata/md5-cache/acct-user/strelaysrv-1
-2206272223 metadata/md5-cache/acct-user/stubby-0-r1
-2206272223 metadata/md5-cache/acct-user/stunnel-0-r1
-2206272223 metadata/md5-cache/acct-user/subsonic-0-r1
-2206272223 metadata/md5-cache/acct-user/suricata-0-r1
-2206272223 metadata/md5-cache/acct-user/svn-0-r1
-2206272223 metadata/md5-cache/acct-user/svxlink-0
-2206272223 metadata/md5-cache/acct-user/swift-0-r1
-2206272223 metadata/md5-cache/acct-user/syncthing-0-r1
-2206272223 metadata/md5-cache/acct-user/systemd-coredump-0-r1
-2206272223 metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
-2206272223 metadata/md5-cache/acct-user/systemd-network-0-r1
-2206272223 metadata/md5-cache/acct-user/systemd-oom-0
-2206272223 metadata/md5-cache/acct-user/systemd-resolve-0-r1
-2206272223 metadata/md5-cache/acct-user/systemd-timesync-0-r1
-2206272223 metadata/md5-cache/acct-user/taskd-0
-2206272223 metadata/md5-cache/acct-user/teamspeak-0-r1
-2206272223 metadata/md5-cache/acct-user/telegraf-0-r1
-2206272223 metadata/md5-cache/acct-user/tenshi-0
-2206272223 metadata/md5-cache/acct-user/thttpd-0
-2206272223 metadata/md5-cache/acct-user/timidity-0
-2206272223 metadata/md5-cache/acct-user/tinydns-0
-2206272223 metadata/md5-cache/acct-user/tinyproxy-0
-2206272223 metadata/md5-cache/acct-user/tomcat-0
-2206272223 metadata/md5-cache/acct-user/tor-0-r1
-2206272223 metadata/md5-cache/acct-user/tox-0-r1
-2206272223 metadata/md5-cache/acct-user/tpm-0
-2206272223 metadata/md5-cache/acct-user/transmission-1-r1
-2206272223 metadata/md5-cache/acct-user/trickster-0
-2206272223 metadata/md5-cache/acct-user/trojan-0
-2206272223 metadata/md5-cache/acct-user/tss-0-r1
-2206272223 metadata/md5-cache/acct-user/ttrssd-0
-2206272223 metadata/md5-cache/acct-user/turnserver-0-r1
-2206272223 metadata/md5-cache/acct-user/tvheadend-0-r1
-2206272223 metadata/md5-cache/acct-user/ulogd-0
-2206272223 metadata/md5-cache/acct-user/ultimaker-0-r1
-2206272223 metadata/md5-cache/acct-user/unbound-0-r1
-2206272223 metadata/md5-cache/acct-user/unbound-telemetry-1
-2206272223 metadata/md5-cache/acct-user/unifi-0-r1
-2206272223 metadata/md5-cache/acct-user/unifi-video-0
-2206272223 metadata/md5-cache/acct-user/unrealircd-0-r1
-2206272223 metadata/md5-cache/acct-user/upmpdcli-0
-2206272223 metadata/md5-cache/acct-user/usbmux-0-r1
-2206272223 metadata/md5-cache/acct-user/ushare-0
-2206272223 metadata/md5-cache/acct-user/uwsgi_exporter-0
-2206272223 metadata/md5-cache/acct-user/vacation-0
-2206272223 metadata/md5-cache/acct-user/varnish-0-r1
-2206272223 metadata/md5-cache/acct-user/vault-0-r1
-2206272223 metadata/md5-cache/acct-user/vault_exporter-0
-2206272223 metadata/md5-cache/acct-user/vboxguest-0-r1
-2206272223 metadata/md5-cache/acct-user/vdr-0-r1
-2206272223 metadata/md5-cache/acct-user/vdradmin-0-r1
-2206272223 metadata/md5-cache/acct-user/vnstat-0
-2206272223 metadata/md5-cache/acct-user/vpopmail-0-r1
-2206272223 metadata/md5-cache/acct-user/wesnoth-0-r1
-2206272223 metadata/md5-cache/acct-user/wwwoffle-0
-2206272223 metadata/md5-cache/acct-user/x2goprint-0-r1
-2206272223 metadata/md5-cache/acct-user/x2gouser-0-r1
-2206272223 metadata/md5-cache/acct-user/xrootd-0-r1
-2206272223 metadata/md5-cache/acct-user/zabbix-0
-2206272223 metadata/md5-cache/acct-user/zeppelin-0-r1
-2206272223 metadata/md5-cache/acct-user/zetcd-0
-2206272223 metadata/md5-cache/acct-user/ziproxy-0
-2206272223 metadata/md5-cache/acct-user/znc-0-r1
-2206272223 metadata/md5-cache/acct-user/zookeeper-0
-2206300140 metadata/md5-cache/acct-user/Manifest.gz
-2206300140 metadata/md5-cache/acct-user/uptimed-0-r2
+2207101610 metadata/md5-cache/acct-group/Manifest.gz
+2207101610 metadata/md5-cache/acct-group/abrt-0-r1
+2207101610 metadata/md5-cache/acct-group/adm-0-r1
+2207101610 metadata/md5-cache/acct-group/aerospike-amc-0
+2207101610 metadata/md5-cache/acct-group/airdcppd-0-r1
+2207101610 metadata/md5-cache/acct-group/alertmanager-0
+2207101610 metadata/md5-cache/acct-group/amanda-0
+2207101610 metadata/md5-cache/acct-group/amavis-0-r1
+2207101610 metadata/md5-cache/acct-group/amule-0-r1
+2207101610 metadata/md5-cache/acct-group/android-0
+2207101610 metadata/md5-cache/acct-group/anope-0-r1
+2207101610 metadata/md5-cache/acct-group/apache-0-r2
+2207101610 metadata/md5-cache/acct-group/apt-cacher-ng-0
+2207101610 metadata/md5-cache/acct-group/argus-0
+2207101610 metadata/md5-cache/acct-group/arpwatch-0
+2207101610 metadata/md5-cache/acct-group/artifactory-0
+2207101610 metadata/md5-cache/acct-group/aspnet-0
+2207101610 metadata/md5-cache/acct-group/asterisk-0-r1
+2207101610 metadata/md5-cache/acct-group/at-0
+2207101610 metadata/md5-cache/acct-group/atheme-services-0-r1
+2207101610 metadata/md5-cache/acct-group/audio-0-r1
+2207101610 metadata/md5-cache/acct-group/automatic-0
+2207101610 metadata/md5-cache/acct-group/automx2-0-r1
+2207101610 metadata/md5-cache/acct-group/avahi-0-r1
+2207101610 metadata/md5-cache/acct-group/avahi-autoipd-0-r1
+2207101610 metadata/md5-cache/acct-group/axtls-0
+2207101610 metadata/md5-cache/acct-group/backuppc-0
+2207101610 metadata/md5-cache/acct-group/bacula-0-r1
+2207101610 metadata/md5-cache/acct-group/bareos-0-r1
+2207101610 metadata/md5-cache/acct-group/beanstalk-0
+2207101610 metadata/md5-cache/acct-group/bedrock-0-r1
+2207101610 metadata/md5-cache/acct-group/biboumi-0
+2207101610 metadata/md5-cache/acct-group/bind_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/bird-0
+2207101610 metadata/md5-cache/acct-group/bitcoin-0-r1
+2207101610 metadata/md5-cache/acct-group/bitflu-0
+2207101610 metadata/md5-cache/acct-group/bitlbee-0-r1
+2207101610 metadata/md5-cache/acct-group/blackbox_exporter-0
+2207101610 metadata/md5-cache/acct-group/boinc-0
+2207101610 metadata/md5-cache/acct-group/brlapi-0
+2207101610 metadata/md5-cache/acct-group/brltty-0
+2207101610 metadata/md5-cache/acct-group/buildbot-0-r1
+2207101610 metadata/md5-cache/acct-group/bumblebee-0
+2207101610 metadata/md5-cache/acct-group/burp-0-r1
+2207101610 metadata/md5-cache/acct-group/burrow_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/cadvisor-0-r1
+2207101610 metadata/md5-cache/acct-group/cancd-0
+2207101610 metadata/md5-cache/acct-group/carbon-0-r1
+2207101610 metadata/md5-cache/acct-group/cdrom-0-r1
+2207101610 metadata/md5-cache/acct-group/ceph-0-r1
+2207101610 metadata/md5-cache/acct-group/cgit-0
+2207101610 metadata/md5-cache/acct-group/chronograf-0-r1
+2207101610 metadata/md5-cache/acct-group/cinder-0-r1
+2207101610 metadata/md5-cache/acct-group/clair-0-r1
+2207101610 metadata/md5-cache/acct-group/clamav-0-r1
+2207101610 metadata/md5-cache/acct-group/cmd5checkpw-0-r1
+2207101610 metadata/md5-cache/acct-group/cntlm-0
+2207101610 metadata/md5-cache/acct-group/cockroach-0
+2207101610 metadata/md5-cache/acct-group/collectd-0
+2207101610 metadata/md5-cache/acct-group/colord-0
+2207101610 metadata/md5-cache/acct-group/consul-0-r1
+2207101610 metadata/md5-cache/acct-group/consul-template-0-r1
+2207101610 metadata/md5-cache/acct-group/consul_exporter-0
+2207101610 metadata/md5-cache/acct-group/coredns-0
+2207101610 metadata/md5-cache/acct-group/croc-0
+2207101610 metadata/md5-cache/acct-group/cron-0
+2207101610 metadata/md5-cache/acct-group/crontab-0
+2207101610 metadata/md5-cache/acct-group/cvmfs-0-r1
+2207101610 metadata/md5-cache/acct-group/davfs2-0-r1
+2207101610 metadata/md5-cache/acct-group/dbmail-0
+2207101610 metadata/md5-cache/acct-group/dbskkd-0
+2207101610 metadata/md5-cache/acct-group/ddclient-0-r1
+2207101610 metadata/md5-cache/acct-group/defang-0
+2207101610 metadata/md5-cache/acct-group/dehydrated-0
+2207101610 metadata/md5-cache/acct-group/deluge-0-r1
+2207101610 metadata/md5-cache/acct-group/dhcp-0-r1
+2207101610 metadata/md5-cache/acct-group/dhcpcd-0-r1
+2207101610 metadata/md5-cache/acct-group/dialout-0-r1
+2207101610 metadata/md5-cache/acct-group/dictd-0
+2207101610 metadata/md5-cache/acct-group/dirsrv-0
+2207101610 metadata/md5-cache/acct-group/disk-0-r1
+2207101610 metadata/md5-cache/acct-group/distcc-1
+2207101610 metadata/md5-cache/acct-group/dnrd-0
+2207101610 metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
+2207101610 metadata/md5-cache/acct-group/dnsdist-0-r1
+2207101610 metadata/md5-cache/acct-group/dnsmasq-0-r1
+2207101610 metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/docker-0-r1
+2207101610 metadata/md5-cache/acct-group/docker_auth-0-r1
+2207101610 metadata/md5-cache/acct-group/dovecot-0-r1
+2207101610 metadata/md5-cache/acct-group/dovenull-0-r1
+2207101610 metadata/md5-cache/acct-group/drone-0
+2207101610 metadata/md5-cache/acct-group/ejabberd-0
+2207101610 metadata/md5-cache/acct-group/elasticsearch-0-r1
+2207101610 metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/energi3-0
+2207101610 metadata/md5-cache/acct-group/epam-0
+2207101610 metadata/md5-cache/acct-group/epmd-0-r1
+2207101610 metadata/md5-cache/acct-group/err-0
+2207101610 metadata/md5-cache/acct-group/etcd-0-r1
+2207101610 metadata/md5-cache/acct-group/exabgp-0-r1
+2207101610 metadata/md5-cache/acct-group/ez-ipupd-0
+2207101610 metadata/md5-cache/acct-group/fax-0
+2207101610 metadata/md5-cache/acct-group/fcron-0
+2207101610 metadata/md5-cache/acct-group/fdm-0
+2207101610 metadata/md5-cache/acct-group/fetchmail-0-r1
+2207101610 metadata/md5-cache/acct-group/fhem-0-r1
+2207101610 metadata/md5-cache/acct-group/fingerprint-0-r1
+2207101610 metadata/md5-cache/acct-group/firebird-0-r1
+2207101610 metadata/md5-cache/acct-group/flatpak-0
+2207101610 metadata/md5-cache/acct-group/flows-0
+2207101610 metadata/md5-cache/acct-group/fluentd-0-r1
+2207101610 metadata/md5-cache/acct-group/foldingathome-0
+2207101610 metadata/md5-cache/acct-group/fp-multiuser-0
+2207101610 metadata/md5-cache/acct-group/freenet-0
+2207101610 metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
+2207101610 metadata/md5-cache/acct-group/frr-0
+2207101610 metadata/md5-cache/acct-group/ftp-0-r1
+2207101610 metadata/md5-cache/acct-group/ftpproxy-0
+2207101610 metadata/md5-cache/acct-group/fvwm-crystal-0-r1
+2207101610 metadata/md5-cache/acct-group/gamemode-0
+2207101610 metadata/md5-cache/acct-group/gamestat-0-r1
+2207101610 metadata/md5-cache/acct-group/gatling-0-r1
+2207101610 metadata/md5-cache/acct-group/gauth-0
+2207101610 metadata/md5-cache/acct-group/gdm-0
+2207101610 metadata/md5-cache/acct-group/geneweb-0-r1
+2207101610 metadata/md5-cache/acct-group/geoclue-0
+2207101610 metadata/md5-cache/acct-group/gerbera-0-r1
+2207101610 metadata/md5-cache/acct-group/git-0-r1
+2207101610 metadata/md5-cache/acct-group/github-exporter-0
+2207101610 metadata/md5-cache/acct-group/gitlab-runner-1
+2207101610 metadata/md5-cache/acct-group/gkrellmd-0-r1
+2207101610 metadata/md5-cache/acct-group/glance-0-r1
+2207101610 metadata/md5-cache/acct-group/gluster-0-r1
+2207101610 metadata/md5-cache/acct-group/gnump3d-0
+2207101610 metadata/md5-cache/acct-group/gnupg-pkcs11-0
+2207101610 metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
+2207101610 metadata/md5-cache/acct-group/gopher-0
+2207101610 metadata/md5-cache/acct-group/gopherd-0
+2207101610 metadata/md5-cache/acct-group/gpib-0-r1
+2207101610 metadata/md5-cache/acct-group/gpio-0
+2207101610 metadata/md5-cache/acct-group/grafana-0-r1
+2207101610 metadata/md5-cache/acct-group/graylog-0-r1
+2207101610 metadata/md5-cache/acct-group/greetd-0-r1
+2207101610 metadata/md5-cache/acct-group/grok_exporter-0
+2207101610 metadata/md5-cache/acct-group/groonga-0
+2207101610 metadata/md5-cache/acct-group/gvm-0-r1
+2207101610 metadata/md5-cache/acct-group/h2o-0
+2207101610 metadata/md5-cache/acct-group/haclient-0
+2207101610 metadata/md5-cache/acct-group/haproxy-0-r1
+2207101610 metadata/md5-cache/acct-group/havp-0
+2207101610 metadata/md5-cache/acct-group/headscale-0
+2207101610 metadata/md5-cache/acct-group/heat-0-r1
+2207101610 metadata/md5-cache/acct-group/hsqldb-0
+2207101610 metadata/md5-cache/acct-group/http-0
+2207101610 metadata/md5-cache/acct-group/i2c-0
+2207101610 metadata/md5-cache/acct-group/i2p-0-r1
+2207101610 metadata/md5-cache/acct-group/i2pd-0-r1
+2207101610 metadata/md5-cache/acct-group/icecast-0
+2207101610 metadata/md5-cache/acct-group/icecream-0
+2207101610 metadata/md5-cache/acct-group/ices-0
+2207101610 metadata/md5-cache/acct-group/icinga-0-r1
+2207101610 metadata/md5-cache/acct-group/icingacmd-0-r1
+2207101610 metadata/md5-cache/acct-group/icingaweb2-0-r1
+2207101610 metadata/md5-cache/acct-group/influxdb-0-r1
+2207101610 metadata/md5-cache/acct-group/input-0-r1
+2207101610 metadata/md5-cache/acct-group/inspircd-0-r1
+2207101610 metadata/md5-cache/acct-group/ipfs-0-r1
+2207101610 metadata/md5-cache/acct-group/ipsec-0
+2207101610 metadata/md5-cache/acct-group/ipsentinel-0
+2207101610 metadata/md5-cache/acct-group/iroffer-0
+2207101610 metadata/md5-cache/acct-group/jabber-0
+2207101610 metadata/md5-cache/acct-group/jenkins-0
+2207101610 metadata/md5-cache/acct-group/kafka-0-r1
+2207101610 metadata/md5-cache/acct-group/kapacitor-0-r1
+2207101610 metadata/md5-cache/acct-group/karma-0
+2207101610 metadata/md5-cache/acct-group/keystone-0-r1
+2207101610 metadata/md5-cache/acct-group/kibana-0-r1
+2207101610 metadata/md5-cache/acct-group/kismet-0-r1
+2207101610 metadata/md5-cache/acct-group/kmem-0-r1
+2207101610 metadata/md5-cache/acct-group/knot-0-r1
+2207101610 metadata/md5-cache/acct-group/kube-apiserver-0-r1
+2207101610 metadata/md5-cache/acct-group/kube-controller-manager-0-r1
+2207101610 metadata/md5-cache/acct-group/kube-scheduler-0-r1
+2207101610 metadata/md5-cache/acct-group/kvm-0-r1
+2207101610 metadata/md5-cache/acct-group/ldap-0
+2207101610 metadata/md5-cache/acct-group/libreoffice-0
+2207101610 metadata/md5-cache/acct-group/libvirt-0-r1
+2207101610 metadata/md5-cache/acct-group/lightdm-0-r1
+2207101610 metadata/md5-cache/acct-group/lighttpd-0-r1
+2207101610 metadata/md5-cache/acct-group/litecoin-0
+2207101610 metadata/md5-cache/acct-group/lldpd-0-r1
+2207101610 metadata/md5-cache/acct-group/locate-0-r1
+2207101610 metadata/md5-cache/acct-group/logcheck-0
+2207101610 metadata/md5-cache/acct-group/logstash-0-r1
+2207101610 metadata/md5-cache/acct-group/logsurfer-0
+2207101610 metadata/md5-cache/acct-group/lp-0-r1
+2207101610 metadata/md5-cache/acct-group/lpadmin-0-r1
+2207101610 metadata/md5-cache/acct-group/lxc-0
+2207101610 metadata/md5-cache/acct-group/lxd-0-r1
+2207101610 metadata/md5-cache/acct-group/mail-0-r1
+2207101610 metadata/md5-cache/acct-group/man-0-r1
+2207101610 metadata/md5-cache/acct-group/maradns-0-r1
+2207101610 metadata/md5-cache/acct-group/memcached-0-r1
+2207101610 metadata/md5-cache/acct-group/memcached_exporter-0
+2207101610 metadata/md5-cache/acct-group/messagebus-0-r1
+2207101610 metadata/md5-cache/acct-group/mgraph-0
+2207101610 metadata/md5-cache/acct-group/milter-regex-0-r1
+2207101610 metadata/md5-cache/acct-group/minbif-0
+2207101610 metadata/md5-cache/acct-group/minecraft-0-r1
+2207101610 metadata/md5-cache/acct-group/minetest-0-r1
+2207101610 metadata/md5-cache/acct-group/minidlna-0
+2207101610 metadata/md5-cache/acct-group/minio-0
+2207101610 metadata/md5-cache/acct-group/mogile-0
+2207101610 metadata/md5-cache/acct-group/mongodb-0-r1
+2207101610 metadata/md5-cache/acct-group/mongodb_exporter-0
+2207101610 metadata/md5-cache/acct-group/monitorix-0-r1
+2207101610 metadata/md5-cache/acct-group/monkeyd-0
+2207101610 metadata/md5-cache/acct-group/monkeysphere-0-r1
+2207101610 metadata/md5-cache/acct-group/mosquitto-0-r1
+2207101610 metadata/md5-cache/acct-group/motion-0-r1
+2207101610 metadata/md5-cache/acct-group/msmtpd-0-r1
+2207101610 metadata/md5-cache/acct-group/munge-0
+2207101610 metadata/md5-cache/acct-group/munin-0-r1
+2207101610 metadata/md5-cache/acct-group/murmur-0-r1
+2207101610 metadata/md5-cache/acct-group/mysql-0-r1
+2207101610 metadata/md5-cache/acct-group/mysqld_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/mythtv-0-r1
+2207101610 metadata/md5-cache/acct-group/nagios-0-r1
+2207101610 metadata/md5-cache/acct-group/named-0-r1
+2207101610 metadata/md5-cache/acct-group/netbox-0-r1
+2207101610 metadata/md5-cache/acct-group/netdata-0-r1
+2207101610 metadata/md5-cache/acct-group/netdev-0-r1
+2207101610 metadata/md5-cache/acct-group/netperf-0
+2207101610 metadata/md5-cache/acct-group/neutron-0-r1
+2207101610 metadata/md5-cache/acct-group/nginx-0-r1
+2207101610 metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/ngircd-0-r1
+2207101610 metadata/md5-cache/acct-group/ngrep-0-r1
+2207101610 metadata/md5-cache/acct-group/nm-openconnect-0
+2207101610 metadata/md5-cache/acct-group/nm-openvpn-0
+2207101610 metadata/md5-cache/acct-group/nobody-0
+2207101610 metadata/md5-cache/acct-group/node_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/nofiles-0-r1
+2207101610 metadata/md5-cache/acct-group/notary-0
+2207101610 metadata/md5-cache/acct-group/nova-0-r1
+2207101610 metadata/md5-cache/acct-group/nsd-0-r1
+2207101610 metadata/md5-cache/acct-group/nslcd-0-r1
+2207101610 metadata/md5-cache/acct-group/ntopng-0
+2207101610 metadata/md5-cache/acct-group/ntp-0-r1
+2207101610 metadata/md5-cache/acct-group/nullmail-0
+2207101610 metadata/md5-cache/acct-group/nut-0
+2207101610 metadata/md5-cache/acct-group/nzbget-0
+2207101610 metadata/md5-cache/acct-group/oidentd-0-r1
+2207101610 metadata/md5-cache/acct-group/openct-0-r1
+2207101610 metadata/md5-cache/acct-group/opendkim-0-r1
+2207101610 metadata/md5-cache/acct-group/opendmarc-1
+2207101610 metadata/md5-cache/acct-group/opendnssec-0
+2207101610 metadata/md5-cache/acct-group/openntpd-0-r1
+2207101610 metadata/md5-cache/acct-group/openrct2-0-r1
+2207101610 metadata/md5-cache/acct-group/openttd-0
+2207101610 metadata/md5-cache/acct-group/openvpn-0-r1
+2207101610 metadata/md5-cache/acct-group/openvpn_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/opm-0
+2207101610 metadata/md5-cache/acct-group/oprofile-0-r1
+2207101610 metadata/md5-cache/acct-group/oragono-0
+2207101610 metadata/md5-cache/acct-group/ossec-0-r1
+2207101610 metadata/md5-cache/acct-group/p2p-0
+2207101610 metadata/md5-cache/acct-group/partimag-0-r1
+2207101610 metadata/md5-cache/acct-group/pcap-0
+2207101610 metadata/md5-cache/acct-group/pcscd-0-r1
+2207101610 metadata/md5-cache/acct-group/pdns-0-r1
+2207101610 metadata/md5-cache/acct-group/pdnsd-0-r1
+2207101610 metadata/md5-cache/acct-group/pgagent-0
+2207101610 metadata/md5-cache/acct-group/pipewire-0
+2207101610 metadata/md5-cache/acct-group/pkcs11-0
+2207101610 metadata/md5-cache/acct-group/placement-0-r1
+2207101610 metadata/md5-cache/acct-group/plex-0-r1
+2207101610 metadata/md5-cache/acct-group/plugdev-0-r1
+2207101610 metadata/md5-cache/acct-group/polkitd-0-r1
+2207101610 metadata/md5-cache/acct-group/polw-0
+2207101610 metadata/md5-cache/acct-group/popa3d-0
+2207101610 metadata/md5-cache/acct-group/portage-0
+2207101610 metadata/md5-cache/acct-group/postdrop-0-r1
+2207101610 metadata/md5-cache/acct-group/postfix-0-r1
+2207101610 metadata/md5-cache/acct-group/postfix_exporter-0-r1
+2207101610 metadata/md5-cache/acct-group/postfwd-0
+2207101610 metadata/md5-cache/acct-group/postgres-0-r1
+2207101610 metadata/md5-cache/acct-group/postgres_exporter-0
+2207101610 metadata/md5-cache/acct-group/postgrey-0
+2207101610 metadata/md5-cache/acct-group/privoxy-0-r1
+2207101610 metadata/md5-cache/acct-group/prometheus-0-r1
+2207101610 metadata/md5-cache/acct-group/prosody-0
+2207101610 metadata/md5-cache/acct-group/psybnc-0
+2207101610 metadata/md5-cache/acct-group/pulse-0
+2207101610 metadata/md5-cache/acct-group/pulse-access-0
+2207101610 metadata/md5-cache/acct-group/puppet-0-r1
+2207101610 metadata/md5-cache/acct-group/puppetdb-0-r1
+2207101610 metadata/md5-cache/acct-group/pushgateway-0
+2207101610 metadata/md5-cache/acct-group/pvpgn-0
+2207101610 metadata/md5-cache/acct-group/qemu-0-r1
+2207101610 metadata/md5-cache/acct-group/qmail-0-r1
+2207101610 metadata/md5-cache/acct-group/quagga-0-r1
+2207101610 metadata/md5-cache/acct-group/quassel-0-r1
+2207101610 metadata/md5-cache/acct-group/rabbitmq-0
+2207101610 metadata/md5-cache/acct-group/rabbitmq_exporter-0
+2207101610 metadata/md5-cache/acct-group/radicale-0-r1
+2207101610 metadata/md5-cache/acct-group/radius-0-r1
+2207101610 metadata/md5-cache/acct-group/radvd-0
+2207101610 metadata/md5-cache/acct-group/rbldns-0-r1
+2207101610 metadata/md5-cache/acct-group/rbot-0
+2207101610 metadata/md5-cache/acct-group/realtime-0
+2207101610 metadata/md5-cache/acct-group/redis-0-r1
+2207101610 metadata/md5-cache/acct-group/redis_exporter-0
+2207101610 metadata/md5-cache/acct-group/redmine-0-r1
+2207101610 metadata/md5-cache/acct-group/redsocks-0-r1
+2207101610 metadata/md5-cache/acct-group/reg-0-r1
+2207101610 metadata/md5-cache/acct-group/registry-0
+2207101610 metadata/md5-cache/acct-group/render-0-r1
+2207101610 metadata/md5-cache/acct-group/resin-0
+2207101610 metadata/md5-cache/acct-group/roccat-0
+2207101610 metadata/md5-cache/acct-group/root-0
+2207101610 metadata/md5-cache/acct-group/ros-0
+2207101610 metadata/md5-cache/acct-group/rplayd-0
+2207101610 metadata/md5-cache/acct-group/rrdcached-0
+2207101610 metadata/md5-cache/acct-group/rslsync-0
+2207101610 metadata/md5-cache/acct-group/rspamd-0-r1
+2207101610 metadata/md5-cache/acct-group/rstudio-server-0-r1
+2207101610 metadata/md5-cache/acct-group/rt-0-r1
+2207101610 metadata/md5-cache/acct-group/rtkit-0-r1
+2207101610 metadata/md5-cache/acct-group/rundeck-0
+2207101610 metadata/md5-cache/acct-group/rwhoisd-0
+2207101610 metadata/md5-cache/acct-group/sabnzbd-0-r1
+2207101610 metadata/md5-cache/acct-group/sagan-0
+2207101610 metadata/md5-cache/acct-group/samplicator-0
+2207101610 metadata/md5-cache/acct-group/sancp-0
+2207101610 metadata/md5-cache/acct-group/sanlock-0-r1
+2207101610 metadata/md5-cache/acct-group/sauerbraten-0-r1
+2207101610 metadata/md5-cache/acct-group/scanlogd-0
+2207101610 metadata/md5-cache/acct-group/scanner-0
+2207101610 metadata/md5-cache/acct-group/scponly-0-r1
+2207101610 metadata/md5-cache/acct-group/scsi-0
+2207101610 metadata/md5-cache/acct-group/sddm-0
+2207101610 metadata/md5-cache/acct-group/seat-0
+2207101610 metadata/md5-cache/acct-group/serf-0
+2207101610 metadata/md5-cache/acct-group/sguil-0
+2207101610 metadata/md5-cache/acct-group/sgx-0
+2207101610 metadata/md5-cache/acct-group/shellinaboxd-0-r1
+2207101610 metadata/md5-cache/acct-group/sigh-0
+2207101610 metadata/md5-cache/acct-group/simplevirt-0-r1
+2207101610 metadata/md5-cache/acct-group/sispmctl-0
+2207101610 metadata/md5-cache/acct-group/sks-0
+2207101610 metadata/md5-cache/acct-group/slurm-0-r1
+2207101610 metadata/md5-cache/acct-group/smmsp-0-r1
+2207101610 metadata/md5-cache/acct-group/smokeping-0
+2207101610 metadata/md5-cache/acct-group/sms-0
+2207101610 metadata/md5-cache/acct-group/smtpd-0-r1
+2207101610 metadata/md5-cache/acct-group/smtpq-0-r1
+2207101610 metadata/md5-cache/acct-group/snapserver-0
+2207101610 metadata/md5-cache/acct-group/sniproxy-0
+2207101610 metadata/md5-cache/acct-group/snmp_exporter-0
+2207101610 metadata/md5-cache/acct-group/snort-0
+2207101610 metadata/md5-cache/acct-group/sobby-0
+2207101610 metadata/md5-cache/acct-group/sobexsrv-0
+2207101610 metadata/md5-cache/acct-group/sockd-0
+2207101610 metadata/md5-cache/acct-group/sogo-0-r1
+2207101610 metadata/md5-cache/acct-group/spamd-0-r1
+2207101610 metadata/md5-cache/acct-group/spectrum-0-r1
+2207101610 metadata/md5-cache/acct-group/spi-0
+2207101610 metadata/md5-cache/acct-group/spire-0-r1
+2207101610 metadata/md5-cache/acct-group/spread-0
+2207101610 metadata/md5-cache/acct-group/sqlgrey-0-r1
+2207101610 metadata/md5-cache/acct-group/squid-0-r1
+2207101610 metadata/md5-cache/acct-group/sshd-0-r1
+2207101610 metadata/md5-cache/acct-group/ssmtp-0
+2207101610 metadata/md5-cache/acct-group/sstpc-0
+2207101610 metadata/md5-cache/acct-group/stapdev-0
+2207101610 metadata/md5-cache/acct-group/stapsys-0
+2207101610 metadata/md5-cache/acct-group/stapusr-0
+2207101610 metadata/md5-cache/acct-group/steamcmd-0-r1
+2207101610 metadata/md5-cache/acct-group/stg-0
+2207101610 metadata/md5-cache/acct-group/stubby-0-r1
+2207101610 metadata/md5-cache/acct-group/stunnel-0-r1
+2207101610 metadata/md5-cache/acct-group/subsonic-0
+2207101610 metadata/md5-cache/acct-group/supervisor-0-r1
+2207101610 metadata/md5-cache/acct-group/suricata-0-r1
+2207101610 metadata/md5-cache/acct-group/svnusers-0-r1
+2207101610 metadata/md5-cache/acct-group/svxlink-0
+2207101610 metadata/md5-cache/acct-group/swift-0-r1
+2207101610 metadata/md5-cache/acct-group/synapse-0
+2207101610 metadata/md5-cache/acct-group/syncthing-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-coredump-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-hostname-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-journal-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-network-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-oom-0
+2207101610 metadata/md5-cache/acct-group/systemd-resolve-0-r1
+2207101610 metadata/md5-cache/acct-group/systemd-timesync-0-r1
+2207101610 metadata/md5-cache/acct-group/tape-0-r1
+2207101610 metadata/md5-cache/acct-group/taskd-0
+2207101610 metadata/md5-cache/acct-group/teamspeak-0-r1
+2207101610 metadata/md5-cache/acct-group/telegraf-0-r1
+2207101610 metadata/md5-cache/acct-group/tenshi-0
+2207101610 metadata/md5-cache/acct-group/thttpd-0
+2207101610 metadata/md5-cache/acct-group/tinyproxy-0
+2207101610 metadata/md5-cache/acct-group/tomcat-0
+2207101610 metadata/md5-cache/acct-group/tor-0-r1
+2207101610 metadata/md5-cache/acct-group/tox-0-r1
+2207101610 metadata/md5-cache/acct-group/tpm-0
+2207101610 metadata/md5-cache/acct-group/transmission-0-r1
+2207101610 metadata/md5-cache/acct-group/trickster-0
+2207101610 metadata/md5-cache/acct-group/trojan-0
+2207101610 metadata/md5-cache/acct-group/tsm-0-r1
+2207101610 metadata/md5-cache/acct-group/tss-0-r1
+2207101610 metadata/md5-cache/acct-group/ttrssd-0
+2207101610 metadata/md5-cache/acct-group/tty-0-r1
+2207101610 metadata/md5-cache/acct-group/turnserver-0-r1
+2207101610 metadata/md5-cache/acct-group/ubridge-0-r1
+2207101610 metadata/md5-cache/acct-group/ulogd-0
+2207101610 metadata/md5-cache/acct-group/ultimaker-0-r1
+2207101610 metadata/md5-cache/acct-group/unbound-0-r1
+2207101610 metadata/md5-cache/acct-group/unbound-telemetry-0
+2207101610 metadata/md5-cache/acct-group/unifi-0-r1
+2207101610 metadata/md5-cache/acct-group/unifi-video-0
+2207101610 metadata/md5-cache/acct-group/unrealircd-0-r1
+2207101610 metadata/md5-cache/acct-group/upmpdcli-0
+2207101610 metadata/md5-cache/acct-group/uptimed-0-r2
+2207101610 metadata/md5-cache/acct-group/usb-0-r1
+2207101610 metadata/md5-cache/acct-group/users-0
+2207101610 metadata/md5-cache/acct-group/ushare-0
+2207101610 metadata/md5-cache/acct-group/utmp-0-r1
+2207101610 metadata/md5-cache/acct-group/uucp-0-r1
+2207101610 metadata/md5-cache/acct-group/uwsgi_exporter-0
+2207101610 metadata/md5-cache/acct-group/vacation-0
+2207101610 metadata/md5-cache/acct-group/varnish-0-r1
+2207101610 metadata/md5-cache/acct-group/vault-0-r1
+2207101610 metadata/md5-cache/acct-group/vault_exporter-0
+2207101610 metadata/md5-cache/acct-group/vboxguest-0-r1
+2207101610 metadata/md5-cache/acct-group/vboxsf-0-r1
+2207101610 metadata/md5-cache/acct-group/vboxusers-0-r1
+2207101610 metadata/md5-cache/acct-group/vdr-0-r1
+2207101610 metadata/md5-cache/acct-group/vdradmin-0-r1
+2207101610 metadata/md5-cache/acct-group/video-0-r1
+2207101610 metadata/md5-cache/acct-group/vlock-0
+2207101610 metadata/md5-cache/acct-group/vnstat-0
+2207101610 metadata/md5-cache/acct-group/vpopmail-0-r1
+2207101610 metadata/md5-cache/acct-group/wesnoth-0-r1
+2207101610 metadata/md5-cache/acct-group/wheel-0-r1
+2207101610 metadata/md5-cache/acct-group/wwwoffle-0
+2207101610 metadata/md5-cache/acct-group/x2goprint-0-r1
+2207101610 metadata/md5-cache/acct-group/x2gouser-0-r1
+2207101610 metadata/md5-cache/acct-group/xpra-0
+2207101610 metadata/md5-cache/acct-group/xrootd-0-r1
+2207101610 metadata/md5-cache/acct-group/xwax-0
+2207101610 metadata/md5-cache/acct-group/zabbix-0
+2207101610 metadata/md5-cache/acct-group/zeppelin-0-r1
+2207101610 metadata/md5-cache/acct-group/zetcd-0
+2207101610 metadata/md5-cache/acct-group/ziproxy-0
+2207101610 metadata/md5-cache/acct-group/znc-0-r1
+2207101610 metadata/md5-cache/acct-group/zookeeper-0
+2207101610 metadata/md5-cache/acct-user/Manifest.gz
+2207101610 metadata/md5-cache/acct-user/abrt-0-r1
+2207101610 metadata/md5-cache/acct-user/aerospike-amc-0
+2207101610 metadata/md5-cache/acct-user/airdcppd-0-r1
+2207101610 metadata/md5-cache/acct-user/alertmanager-0
+2207101610 metadata/md5-cache/acct-user/alias-0-r1
+2207101610 metadata/md5-cache/acct-user/amanda-0
+2207101610 metadata/md5-cache/acct-user/amavis-0-r1
+2207101610 metadata/md5-cache/acct-user/amule-0-r2
+2207101610 metadata/md5-cache/acct-user/anope-0-r1
+2207101610 metadata/md5-cache/acct-user/apache-0-r2
+2207101610 metadata/md5-cache/acct-user/apt-cacher-ng-0
+2207101610 metadata/md5-cache/acct-user/argus-0
+2207101610 metadata/md5-cache/acct-user/arpwatch-0
+2207101610 metadata/md5-cache/acct-user/artifactory-0
+2207101610 metadata/md5-cache/acct-user/aspnet-0
+2207101610 metadata/md5-cache/acct-user/asterisk-0-r1
+2207101610 metadata/md5-cache/acct-user/at-0
+2207101610 metadata/md5-cache/acct-user/atheme-services-0-r1
+2207101610 metadata/md5-cache/acct-user/automatic-0
+2207101610 metadata/md5-cache/acct-user/automx2-0-r1
+2207101610 metadata/md5-cache/acct-user/avahi-0-r1
+2207101610 metadata/md5-cache/acct-user/avahi-autoipd-0-r1
+2207101610 metadata/md5-cache/acct-user/axtls-0
+2207101610 metadata/md5-cache/acct-user/backuppc-0
+2207101610 metadata/md5-cache/acct-user/bacula-0-r1
+2207101610 metadata/md5-cache/acct-user/bareos-0-r1
+2207101610 metadata/md5-cache/acct-user/beanstalk-0
+2207101610 metadata/md5-cache/acct-user/bedrock-0-r1
+2207101610 metadata/md5-cache/acct-user/biboumi-0
+2207101610 metadata/md5-cache/acct-user/bind_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/bird-0
+2207101610 metadata/md5-cache/acct-user/bitcoin-0-r1
+2207101610 metadata/md5-cache/acct-user/bitflu-0
+2207101610 metadata/md5-cache/acct-user/bitlbee-0-r1
+2207101610 metadata/md5-cache/acct-user/blackbox_exporter-0
+2207101610 metadata/md5-cache/acct-user/boinc-0
+2207101610 metadata/md5-cache/acct-user/brltty-0
+2207101610 metadata/md5-cache/acct-user/buildbot-0-r1
+2207101610 metadata/md5-cache/acct-user/burp-0-r1
+2207101610 metadata/md5-cache/acct-user/burrow_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/cadvisor-0-r1
+2207101610 metadata/md5-cache/acct-user/cancd-0-r1
+2207101610 metadata/md5-cache/acct-user/carbon-0-r1
+2207101610 metadata/md5-cache/acct-user/ceph-0-r1
+2207101610 metadata/md5-cache/acct-user/cgit-0
+2207101610 metadata/md5-cache/acct-user/chronograf-0-r1
+2207101610 metadata/md5-cache/acct-user/cinder-0-r1
+2207101610 metadata/md5-cache/acct-user/clair-0-r1
+2207101610 metadata/md5-cache/acct-user/clamav-0-r1
+2207101610 metadata/md5-cache/acct-user/cmd5checkpw-0-r1
+2207101610 metadata/md5-cache/acct-user/cntlm-0
+2207101610 metadata/md5-cache/acct-user/cockroach-0
+2207101610 metadata/md5-cache/acct-user/collectd-0
+2207101610 metadata/md5-cache/acct-user/colord-0
+2207101610 metadata/md5-cache/acct-user/consul-0-r1
+2207101610 metadata/md5-cache/acct-user/consul-template-0-r1
+2207101610 metadata/md5-cache/acct-user/consul_exporter-0
+2207101610 metadata/md5-cache/acct-user/coredns-0
+2207101610 metadata/md5-cache/acct-user/croc-0
+2207101610 metadata/md5-cache/acct-user/cron-0
+2207101610 metadata/md5-cache/acct-user/cvmfs-0-r1
+2207101610 metadata/md5-cache/acct-user/cyrus-0-r2
+2207101610 metadata/md5-cache/acct-user/darkstat-0
+2207101610 metadata/md5-cache/acct-user/davfs2-0-r1
+2207101610 metadata/md5-cache/acct-user/dbmail-0
+2207101610 metadata/md5-cache/acct-user/dbskkd-0
+2207101610 metadata/md5-cache/acct-user/ddclient-0-r1
+2207101610 metadata/md5-cache/acct-user/defang-0
+2207101610 metadata/md5-cache/acct-user/dehydrated-0
+2207101610 metadata/md5-cache/acct-user/deluge-0-r1
+2207101610 metadata/md5-cache/acct-user/dhcp-0-r1
+2207101610 metadata/md5-cache/acct-user/dhcpcd-0-r1
+2207101610 metadata/md5-cache/acct-user/dictd-0
+2207101610 metadata/md5-cache/acct-user/dirsrv-0
+2207101610 metadata/md5-cache/acct-user/distcc-1
+2207101610 metadata/md5-cache/acct-user/dnrd-0
+2207101610 metadata/md5-cache/acct-user/dnscache-0
+2207101610 metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
+2207101610 metadata/md5-cache/acct-user/dnsdist-0-r1
+2207101610 metadata/md5-cache/acct-user/dnslog-0
+2207101610 metadata/md5-cache/acct-user/dnsmasq-0-r1
+2207101610 metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/docker_auth-0-r1
+2207101610 metadata/md5-cache/acct-user/dovecot-0-r1
+2207101610 metadata/md5-cache/acct-user/dovenull-0-r1
+2207101610 metadata/md5-cache/acct-user/drone-0
+2207101610 metadata/md5-cache/acct-user/duende-0-r1
+2207101610 metadata/md5-cache/acct-user/ejabberd-0
+2207101610 metadata/md5-cache/acct-user/ejabberd-1
+2207101610 metadata/md5-cache/acct-user/elasticsearch-0-r1
+2207101610 metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/energi3-0
+2207101610 metadata/md5-cache/acct-user/epmd-0-r1
+2207101610 metadata/md5-cache/acct-user/err-0
+2207101610 metadata/md5-cache/acct-user/etcd-0-r1
+2207101610 metadata/md5-cache/acct-user/exabgp-0-r1
+2207101610 metadata/md5-cache/acct-user/ez-ipupd-0
+2207101610 metadata/md5-cache/acct-user/fax-0
+2207101610 metadata/md5-cache/acct-user/fcron-0
+2207101610 metadata/md5-cache/acct-user/fdm-0
+2207101610 metadata/md5-cache/acct-user/fetchmail-0-r1
+2207101610 metadata/md5-cache/acct-user/fhem-0-r1
+2207101610 metadata/md5-cache/acct-user/firebird-0-r1
+2207101610 metadata/md5-cache/acct-user/flatpak-0
+2207101610 metadata/md5-cache/acct-user/flows-0
+2207101610 metadata/md5-cache/acct-user/fluentd-0-r1
+2207101610 metadata/md5-cache/acct-user/fnord-0
+2207101610 metadata/md5-cache/acct-user/fnordlog-0
+2207101610 metadata/md5-cache/acct-user/foldingathome-0
+2207101610 metadata/md5-cache/acct-user/fp-multiuser-0
+2207101610 metadata/md5-cache/acct-user/freenet-0
+2207101610 metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
+2207101610 metadata/md5-cache/acct-user/frr-0
+2207101610 metadata/md5-cache/acct-user/ftp-0-r3
+2207101610 metadata/md5-cache/acct-user/ftpproxy-0
+2207101610 metadata/md5-cache/acct-user/gatling-0-r1
+2207101610 metadata/md5-cache/acct-user/gauth-0
+2207101610 metadata/md5-cache/acct-user/gdm-0
+2207101610 metadata/md5-cache/acct-user/geneweb-0-r1
+2207101610 metadata/md5-cache/acct-user/geoclue-0
+2207101610 metadata/md5-cache/acct-user/gerbera-0-r1
+2207101610 metadata/md5-cache/acct-user/git-0-r2
+2207101610 metadata/md5-cache/acct-user/github-exporter-0
+2207101610 metadata/md5-cache/acct-user/gitlab-runner-1
+2207101610 metadata/md5-cache/acct-user/gkrellmd-0-r1
+2207101610 metadata/md5-cache/acct-user/glance-0-r1
+2207101610 metadata/md5-cache/acct-user/gluster-0-r1
+2207101610 metadata/md5-cache/acct-user/gnump3d-0
+2207101610 metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
+2207101610 metadata/md5-cache/acct-user/gopher-0
+2207101610 metadata/md5-cache/acct-user/gopherd-0
+2207101610 metadata/md5-cache/acct-user/gpsd-0-r2
+2207101610 metadata/md5-cache/acct-user/grafana-0-r1
+2207101610 metadata/md5-cache/acct-user/graylog-0-r1
+2207101610 metadata/md5-cache/acct-user/greetd-0-r1
+2207101610 metadata/md5-cache/acct-user/grok_exporter-0
+2207101610 metadata/md5-cache/acct-user/groonga-0
+2207101610 metadata/md5-cache/acct-user/gvm-0-r1
+2207101610 metadata/md5-cache/acct-user/h2o-0
+2207101610 metadata/md5-cache/acct-user/hacluster-0
+2207101610 metadata/md5-cache/acct-user/haproxy-0-r1
+2207101610 metadata/md5-cache/acct-user/havp-0
+2207101610 metadata/md5-cache/acct-user/headscale-0
+2207101610 metadata/md5-cache/acct-user/heat-0-r1
+2207101610 metadata/md5-cache/acct-user/hsqldb-0
+2207101610 metadata/md5-cache/acct-user/http-0
+2207101610 metadata/md5-cache/acct-user/i2p-0-r1
+2207101610 metadata/md5-cache/acct-user/i2pd-0-r1
+2207101610 metadata/md5-cache/acct-user/icecast-0
+2207101610 metadata/md5-cache/acct-user/icecream-0
+2207101610 metadata/md5-cache/acct-user/ices-0
+2207101610 metadata/md5-cache/acct-user/icinga-0-r1
+2207101610 metadata/md5-cache/acct-user/icingadirector-0
+2207101610 metadata/md5-cache/acct-user/influxdb-0-r1
+2207101610 metadata/md5-cache/acct-user/inspircd-0-r1
+2207101610 metadata/md5-cache/acct-user/ipfs-0-r1
+2207101610 metadata/md5-cache/acct-user/ippl-0-r1
+2207101610 metadata/md5-cache/acct-user/ipsec-0
+2207101610 metadata/md5-cache/acct-user/ipsentinel-0
+2207101610 metadata/md5-cache/acct-user/iroffer-0
+2207101610 metadata/md5-cache/acct-user/jabber-0
+2207101610 metadata/md5-cache/acct-user/jenkins-0
+2207101610 metadata/md5-cache/acct-user/kafka-0-r1
+2207101610 metadata/md5-cache/acct-user/kapacitor-0-r1
+2207101610 metadata/md5-cache/acct-user/karma-0
+2207101610 metadata/md5-cache/acct-user/keystone-0-r1
+2207101610 metadata/md5-cache/acct-user/kibana-0-r1
+2207101610 metadata/md5-cache/acct-user/kismet-0-r1
+2207101610 metadata/md5-cache/acct-user/knot-0-r1
+2207101610 metadata/md5-cache/acct-user/kube-apiserver-0-r1
+2207101610 metadata/md5-cache/acct-user/kube-controller-manager-0-r1
+2207101610 metadata/md5-cache/acct-user/kube-scheduler-0-r1
+2207101610 metadata/md5-cache/acct-user/ldap-0
+2207101610 metadata/md5-cache/acct-user/libreoffice-0
+2207101610 metadata/md5-cache/acct-user/lightdm-0
+2207101610 metadata/md5-cache/acct-user/lighttpd-0-r1
+2207101610 metadata/md5-cache/acct-user/litecoin-0
+2207101610 metadata/md5-cache/acct-user/lldpd-0-r1
+2207101610 metadata/md5-cache/acct-user/logcheck-0
+2207101610 metadata/md5-cache/acct-user/logstash-0-r1
+2207101610 metadata/md5-cache/acct-user/logsurfer-0
+2207101610 metadata/md5-cache/acct-user/lxc-0
+2207101610 metadata/md5-cache/acct-user/mail-0-r1
+2207101610 metadata/md5-cache/acct-user/man-1-r1
+2207101610 metadata/md5-cache/acct-user/maradns-0-r1
+2207101610 metadata/md5-cache/acct-user/memcached-0-r1
+2207101610 metadata/md5-cache/acct-user/memcached_exporter-0
+2207101610 metadata/md5-cache/acct-user/messagebus-0-r1
+2207101610 metadata/md5-cache/acct-user/mgraph-0
+2207101610 metadata/md5-cache/acct-user/milter-regex-0-r1
+2207101610 metadata/md5-cache/acct-user/minbif-0
+2207101610 metadata/md5-cache/acct-user/minecraft-0-r1
+2207101610 metadata/md5-cache/acct-user/minetest-1-r1
+2207101610 metadata/md5-cache/acct-user/minidlna-0
+2207101610 metadata/md5-cache/acct-user/miniflux-0
+2207101610 metadata/md5-cache/acct-user/minio-0
+2207101610 metadata/md5-cache/acct-user/mogile-0
+2207101610 metadata/md5-cache/acct-user/mongodb-0-r1
+2207101610 metadata/md5-cache/acct-user/mongodb_exporter-0
+2207101610 metadata/md5-cache/acct-user/monitorix-0-r1
+2207101610 metadata/md5-cache/acct-user/monkeyd-0
+2207101610 metadata/md5-cache/acct-user/monkeysphere-0-r1
+2207101610 metadata/md5-cache/acct-user/mosquitto-0-r1
+2207101610 metadata/md5-cache/acct-user/motion-0-r1
+2207101610 metadata/md5-cache/acct-user/mpd-0-r1
+2207101610 metadata/md5-cache/acct-user/msmtpd-0-r1
+2207101610 metadata/md5-cache/acct-user/munge-0
+2207101610 metadata/md5-cache/acct-user/munin-0-r1
+2207101610 metadata/md5-cache/acct-user/munin-async-0-r1
+2207101610 metadata/md5-cache/acct-user/murmur-0-r1
+2207101610 metadata/md5-cache/acct-user/mysql-0-r1
+2207101610 metadata/md5-cache/acct-user/mysqld_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/mythtv-0-r1
+2207101610 metadata/md5-cache/acct-user/nagios-0-r1
+2207101610 metadata/md5-cache/acct-user/named-0-r1
+2207101610 metadata/md5-cache/acct-user/netbox-0-r1
+2207101610 metadata/md5-cache/acct-user/netdata-1
+2207101610 metadata/md5-cache/acct-user/netperf-0
+2207101610 metadata/md5-cache/acct-user/neutron-0-r1
+2207101610 metadata/md5-cache/acct-user/nginx-0
+2207101610 metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/ngircd-0-r1
+2207101610 metadata/md5-cache/acct-user/ngrep-0-r1
+2207101610 metadata/md5-cache/acct-user/nm-openconnect-0
+2207101610 metadata/md5-cache/acct-user/nm-openvpn-0
+2207101610 metadata/md5-cache/acct-user/nobody-0
+2207101610 metadata/md5-cache/acct-user/node_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/notary-0
+2207101610 metadata/md5-cache/acct-user/nova-0-r1
+2207101610 metadata/md5-cache/acct-user/nsd-0-r1
+2207101610 metadata/md5-cache/acct-user/nslcd-0-r1
+2207101610 metadata/md5-cache/acct-user/ntopng-0
+2207101610 metadata/md5-cache/acct-user/ntp-0-r1
+2207101610 metadata/md5-cache/acct-user/nullmail-0
+2207101610 metadata/md5-cache/acct-user/nut-0-r1
+2207101610 metadata/md5-cache/acct-user/nvpd-0
+2207101610 metadata/md5-cache/acct-user/nzbget-0
+2207101610 metadata/md5-cache/acct-user/oidentd-0-r1
+2207101610 metadata/md5-cache/acct-user/openctd-0
+2207101610 metadata/md5-cache/acct-user/opendkim-0-r1
+2207101610 metadata/md5-cache/acct-user/opendmarc-0
+2207101610 metadata/md5-cache/acct-user/opendnssec-0
+2207101610 metadata/md5-cache/acct-user/openntpd-0-r1
+2207101610 metadata/md5-cache/acct-user/openrct2-0-r1
+2207101610 metadata/md5-cache/acct-user/openttd-0
+2207101610 metadata/md5-cache/acct-user/openvpn-0-r1
+2207101610 metadata/md5-cache/acct-user/openvpn_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/opm-0-r1
+2207101610 metadata/md5-cache/acct-user/oprofile-0-r1
+2207101610 metadata/md5-cache/acct-user/oragono-0
+2207101610 metadata/md5-cache/acct-user/ossec-0-r1
+2207101610 metadata/md5-cache/acct-user/ossecm-0-r1
+2207101610 metadata/md5-cache/acct-user/ossecr-0-r1
+2207101610 metadata/md5-cache/acct-user/p2p-0
+2207101610 metadata/md5-cache/acct-user/partimag-0
+2207101610 metadata/md5-cache/acct-user/pcap-0
+2207101610 metadata/md5-cache/acct-user/pcscd-0-r1
+2207101610 metadata/md5-cache/acct-user/pdns-0-r1
+2207101610 metadata/md5-cache/acct-user/pdnsd-0-r1
+2207101610 metadata/md5-cache/acct-user/pgagent-0
+2207101610 metadata/md5-cache/acct-user/pgbouncer-0
+2207101610 metadata/md5-cache/acct-user/pgpool-0
+2207101610 metadata/md5-cache/acct-user/pipewire-0
+2207101610 metadata/md5-cache/acct-user/placement-0-r1
+2207101610 metadata/md5-cache/acct-user/plex-0-r1
+2207101610 metadata/md5-cache/acct-user/polkitd-0-r1
+2207101610 metadata/md5-cache/acct-user/polw-0
+2207101610 metadata/md5-cache/acct-user/popa3d-0
+2207101610 metadata/md5-cache/acct-user/portage-0
+2207101610 metadata/md5-cache/acct-user/postfix-0-r1
+2207101610 metadata/md5-cache/acct-user/postfix_exporter-0-r1
+2207101610 metadata/md5-cache/acct-user/postfwd-0
+2207101610 metadata/md5-cache/acct-user/postgres-0-r1
+2207101610 metadata/md5-cache/acct-user/postgres_exporter-0
+2207101610 metadata/md5-cache/acct-user/postgrey-0
+2207101610 metadata/md5-cache/acct-user/postmaster-0-r1
+2207101610 metadata/md5-cache/acct-user/privoxy-0-r1
+2207101610 metadata/md5-cache/acct-user/prometheus-0-r1
+2207101610 metadata/md5-cache/acct-user/prosody-0
+2207101610 metadata/md5-cache/acct-user/psybnc-0
+2207101610 metadata/md5-cache/acct-user/pulse-0
+2207101610 metadata/md5-cache/acct-user/puppet-0-r1
+2207101610 metadata/md5-cache/acct-user/puppetdb-0-r1
+2207101610 metadata/md5-cache/acct-user/pushgateway-0
+2207101610 metadata/md5-cache/acct-user/pvpgn-0
+2207101610 metadata/md5-cache/acct-user/qemu-0-r1
+2207101610 metadata/md5-cache/acct-user/qmaild-0-r1
+2207101610 metadata/md5-cache/acct-user/qmaill-0-r1
+2207101610 metadata/md5-cache/acct-user/qmailp-0-r1
+2207101610 metadata/md5-cache/acct-user/qmailq-0-r1
+2207101610 metadata/md5-cache/acct-user/qmailr-0-r1
+2207101610 metadata/md5-cache/acct-user/qmails-0-r1
+2207101610 metadata/md5-cache/acct-user/quagga-0-r1
+2207101610 metadata/md5-cache/acct-user/quassel-0-r1
+2207101610 metadata/md5-cache/acct-user/rabbitmq-0
+2207101610 metadata/md5-cache/acct-user/rabbitmq_exporter-0
+2207101610 metadata/md5-cache/acct-user/radicale-0-r2
+2207101610 metadata/md5-cache/acct-user/radius-0-r1
+2207101610 metadata/md5-cache/acct-user/radvd-0
+2207101610 metadata/md5-cache/acct-user/rbldns-0-r1
+2207101610 metadata/md5-cache/acct-user/rbot-0
+2207101610 metadata/md5-cache/acct-user/redis-0-r1
+2207101610 metadata/md5-cache/acct-user/redis_exporter-0
+2207101610 metadata/md5-cache/acct-user/redmine-0-r1
+2207101610 metadata/md5-cache/acct-user/redsocks-0-r1
+2207101610 metadata/md5-cache/acct-user/reg-0-r1
+2207101610 metadata/md5-cache/acct-user/registry-0
+2207101610 metadata/md5-cache/acct-user/root-0-r1
+2207101610 metadata/md5-cache/acct-user/ros-0
+2207101610 metadata/md5-cache/acct-user/rplayd-0
+2207101610 metadata/md5-cache/acct-user/rrdcached-0
+2207101610 metadata/md5-cache/acct-user/rslsync-0
+2207101610 metadata/md5-cache/acct-user/rspamd-0-r1
+2207101610 metadata/md5-cache/acct-user/rstudio-server-0-r1
+2207101610 metadata/md5-cache/acct-user/rt-0
+2207101610 metadata/md5-cache/acct-user/rtkit-0-r1
+2207101610 metadata/md5-cache/acct-user/rundeck-0
+2207101610 metadata/md5-cache/acct-user/rwhoisd-0
+2207101610 metadata/md5-cache/acct-user/sabnzbd-0-r1
+2207101610 metadata/md5-cache/acct-user/sagan-0-r1
+2207101610 metadata/md5-cache/acct-user/samplicator-0
+2207101610 metadata/md5-cache/acct-user/sancp-0
+2207101610 metadata/md5-cache/acct-user/saned-0
+2207101610 metadata/md5-cache/acct-user/sanlock-0-r1
+2207101610 metadata/md5-cache/acct-user/sauerbraten-0-r1
+2207101610 metadata/md5-cache/acct-user/scanlogd-0
+2207101610 metadata/md5-cache/acct-user/scponly-0-r1
+2207101610 metadata/md5-cache/acct-user/sddm-0
+2207101610 metadata/md5-cache/acct-user/sendpage-0
+2207101610 metadata/md5-cache/acct-user/serf-0
+2207101610 metadata/md5-cache/acct-user/sguil-0
+2207101610 metadata/md5-cache/acct-user/shellinaboxd-0-r1
+2207101610 metadata/md5-cache/acct-user/sigh-0
+2207101610 metadata/md5-cache/acct-user/sks-0
+2207101610 metadata/md5-cache/acct-user/slurm-0-r1
+2207101610 metadata/md5-cache/acct-user/smmsp-0-r2
+2207101610 metadata/md5-cache/acct-user/smokeping-0
+2207101610 metadata/md5-cache/acct-user/smsd-0
+2207101610 metadata/md5-cache/acct-user/smtpd-0-r1
+2207101610 metadata/md5-cache/acct-user/smtpq-0-r1
+2207101610 metadata/md5-cache/acct-user/snapclient-0
+2207101610 metadata/md5-cache/acct-user/snapserver-0
+2207101610 metadata/md5-cache/acct-user/sndiod-0
+2207101610 metadata/md5-cache/acct-user/sniproxy-0
+2207101610 metadata/md5-cache/acct-user/snmp_exporter-0
+2207101610 metadata/md5-cache/acct-user/snort-0
+2207101610 metadata/md5-cache/acct-user/sobby-0
+2207101610 metadata/md5-cache/acct-user/sobexsrv-0
+2207101610 metadata/md5-cache/acct-user/sockd-0-r1
+2207101610 metadata/md5-cache/acct-user/sogo-0-r1
+2207101610 metadata/md5-cache/acct-user/spamd-0-r1
+2207101610 metadata/md5-cache/acct-user/spectrum-0-r1
+2207101610 metadata/md5-cache/acct-user/spire-0-r1
+2207101610 metadata/md5-cache/acct-user/spread-0
+2207101610 metadata/md5-cache/acct-user/sqlgrey-0-r1
+2207101610 metadata/md5-cache/acct-user/squid-0-r1
+2207101610 metadata/md5-cache/acct-user/sshd-0-r1
+2207101610 metadata/md5-cache/acct-user/sstpc-0
+2207101610 metadata/md5-cache/acct-user/stdiscosrv-1
+2207101610 metadata/md5-cache/acct-user/steamcmd-0-r1
+2207101610 metadata/md5-cache/acct-user/stg-0
+2207101610 metadata/md5-cache/acct-user/strelaysrv-1
+2207101610 metadata/md5-cache/acct-user/stubby-0-r1
+2207101610 metadata/md5-cache/acct-user/stunnel-0-r1
+2207101610 metadata/md5-cache/acct-user/subsonic-0-r1
+2207101610 metadata/md5-cache/acct-user/suricata-0-r1
+2207101610 metadata/md5-cache/acct-user/svn-0-r1
+2207101610 metadata/md5-cache/acct-user/svxlink-0
+2207101610 metadata/md5-cache/acct-user/swift-0-r1
+2207101610 metadata/md5-cache/acct-user/synapse-0
+2207101610 metadata/md5-cache/acct-user/syncthing-0-r1
+2207101610 metadata/md5-cache/acct-user/systemd-coredump-0-r1
+2207101610 metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
+2207101610 metadata/md5-cache/acct-user/systemd-network-0-r1
+2207101610 metadata/md5-cache/acct-user/systemd-oom-0
+2207101610 metadata/md5-cache/acct-user/systemd-resolve-0-r1
+2207101610 metadata/md5-cache/acct-user/systemd-timesync-0-r1
+2207101610 metadata/md5-cache/acct-user/taskd-0
+2207101610 metadata/md5-cache/acct-user/teamspeak-0-r1
+2207101610 metadata/md5-cache/acct-user/telegraf-0-r1
+2207101610 metadata/md5-cache/acct-user/tenshi-0
+2207101610 metadata/md5-cache/acct-user/thttpd-0
+2207101610 metadata/md5-cache/acct-user/timidity-0
+2207101610 metadata/md5-cache/acct-user/tinydns-0
+2207101610 metadata/md5-cache/acct-user/tinyproxy-0
+2207101610 metadata/md5-cache/acct-user/tomcat-0
+2207101610 metadata/md5-cache/acct-user/tor-0-r1
+2207101610 metadata/md5-cache/acct-user/tox-0-r1
+2207101610 metadata/md5-cache/acct-user/tpm-0
+2207101610 metadata/md5-cache/acct-user/transmission-1-r1
+2207101610 metadata/md5-cache/acct-user/trickster-0
+2207101610 metadata/md5-cache/acct-user/trojan-0
+2207101610 metadata/md5-cache/acct-user/tss-0-r1
+2207101610 metadata/md5-cache/acct-user/ttrssd-0
+2207101610 metadata/md5-cache/acct-user/turnserver-0-r1
+2207101610 metadata/md5-cache/acct-user/tvheadend-0-r1
+2207101610 metadata/md5-cache/acct-user/ulogd-0
+2207101610 metadata/md5-cache/acct-user/ultimaker-0-r1
+2207101610 metadata/md5-cache/acct-user/unbound-0-r1
+2207101610 metadata/md5-cache/acct-user/unbound-telemetry-1
+2207101610 metadata/md5-cache/acct-user/unifi-0-r1
+2207101610 metadata/md5-cache/acct-user/unifi-video-0
+2207101610 metadata/md5-cache/acct-user/unrealircd-0-r1
+2207101610 metadata/md5-cache/acct-user/upmpdcli-0
+2207101610 metadata/md5-cache/acct-user/uptimed-0-r2
+2207101610 metadata/md5-cache/acct-user/usbmux-0-r1
+2207101610 metadata/md5-cache/acct-user/ushare-0
+2207101610 metadata/md5-cache/acct-user/uwsgi_exporter-0
+2207101610 metadata/md5-cache/acct-user/vacation-0
+2207101610 metadata/md5-cache/acct-user/varnish-0-r1
+2207101610 metadata/md5-cache/acct-user/vault-0-r1
+2207101610 metadata/md5-cache/acct-user/vault_exporter-0
+2207101610 metadata/md5-cache/acct-user/vboxguest-0-r1
+2207101610 metadata/md5-cache/acct-user/vdr-0-r1
+2207101610 metadata/md5-cache/acct-user/vdradmin-0-r1
+2207101610 metadata/md5-cache/acct-user/vnstat-0
+2207101610 metadata/md5-cache/acct-user/vpopmail-0-r1
+2207101610 metadata/md5-cache/acct-user/wesnoth-0-r1
+2207101610 metadata/md5-cache/acct-user/wwwoffle-0
+2207101610 metadata/md5-cache/acct-user/x2goprint-0-r1
+2207101610 metadata/md5-cache/acct-user/x2gouser-0-r1
+2207101610 metadata/md5-cache/acct-user/xrootd-0-r1
+2207101610 metadata/md5-cache/acct-user/zabbix-0
+2207101610 metadata/md5-cache/acct-user/zeppelin-0-r1
+2207101610 metadata/md5-cache/acct-user/zetcd-0
+2207101610 metadata/md5-cache/acct-user/ziproxy-0
+2207101610 metadata/md5-cache/acct-user/znc-0-r1
+2207101610 metadata/md5-cache/acct-user/zookeeper-0
 2104180939 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2203070710 metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
 2204172340 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -31081,7 +31213,6 @@
 2110201010 metadata/md5-cache/app-admin/mongo-tools-100.4.1
 2110201010 metadata/md5-cache/app-admin/mongo-tools-4.2.15
 2101270709 metadata/md5-cache/app-admin/multilog-watch-1.12-r1
-2101270439 metadata/md5-cache/app-admin/needrestart-3.3
 2103302109 metadata/md5-cache/app-admin/needrestart-3.5
 2102192239 metadata/md5-cache/app-admin/newsyslog-1.1.0.81-r1
 1711131908 metadata/md5-cache/app-admin/petrovich-1.0.0-r1
@@ -31181,7 +31312,6 @@
 2206272223 metadata/md5-cache/app-admin/eselect-1.4.17
 2206272223 metadata/md5-cache/app-admin/eselect-1.4.20
 2206272223 metadata/md5-cache/app-admin/fetchlog-1.4-r1
-2206272223 metadata/md5-cache/app-admin/fluentd-1.14.4
 2206281115 metadata/md5-cache/app-admin/fsvs-1.2.5-r2
 2206272223 metadata/md5-cache/app-admin/gamin-0.1.10-r1
 2206272223 metadata/md5-cache/app-admin/genromfs-0.5.2
@@ -31202,7 +31332,6 @@
 2206272223 metadata/md5-cache/app-admin/logsurfer+-1.8-r4
 2206272223 metadata/md5-cache/app-admin/longrun-0.9-r4
 2206281115 metadata/md5-cache/app-admin/lsyncd-2.2.3
-2206272223 metadata/md5-cache/app-admin/mcollective-2.12.5
 2206272223 metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
 2206281115 metadata/md5-cache/app-admin/monit-5.29.0
 2206281115 metadata/md5-cache/app-admin/monit-5.31.0
@@ -31215,19 +31344,12 @@
 2206281115 metadata/md5-cache/app-admin/passwordsafe-1.13.0
 2206281115 metadata/md5-cache/app-admin/passwordsafe-1.14.0-r1
 2206272223 metadata/md5-cache/app-admin/paxtest-0.9.15-r1
-2206272223 metadata/md5-cache/app-admin/puppet-5.5.22-r1
-2206272223 metadata/md5-cache/app-admin/puppet-5.5.22-r2
-2206272223 metadata/md5-cache/app-admin/puppet-7.16.0
 2206272223 metadata/md5-cache/app-admin/puppet-agent-7.16.0
-2206272223 metadata/md5-cache/app-admin/puppet-lint-2.5.1
-2206272223 metadata/md5-cache/app-admin/puppet-lint-2.5.2
 2206272223 metadata/md5-cache/app-admin/puppetdb-7.10.1
 2206272223 metadata/md5-cache/app-admin/puppetserver-7.7.0
 2206272223 metadata/md5-cache/app-admin/pwcrypt-1.2.2-r3
 2206272223 metadata/md5-cache/app-admin/qpage-3.3
 2206272223 metadata/md5-cache/app-admin/qtpass-1.3.2-r2
-2206272223 metadata/md5-cache/app-admin/r10k-3.15.0
-2206272223 metadata/md5-cache/app-admin/r10k-3.7.0-r2
 2206272223 metadata/md5-cache/app-admin/rasdaemon-0.6.7
 2206272223 metadata/md5-cache/app-admin/ryzen_smu-0.1.2
 2206272223 metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -31283,10 +31405,6 @@
 2206291742 metadata/md5-cache/app-admin/augeas-1.11.0
 2206291742 metadata/md5-cache/app-admin/augeas-1.11.0-r1
 2206291742 metadata/md5-cache/app-admin/augeas-1.12.0
-2206292140 metadata/md5-cache/app-admin/awscli-1.25.12-r1
-2206292114 metadata/md5-cache/app-admin/awscli-1.25.17-r1
-2206300740 metadata/md5-cache/app-admin/awscli-1.25.20
-2207011010 metadata/md5-cache/app-admin/awscli-1.25.21
 2206292114 metadata/md5-cache/app-admin/calamares-3.2.32.1-r1
 2206291742 metadata/md5-cache/app-admin/ccze-0.2.1-r4
 2206292114 metadata/md5-cache/app-admin/cdist-6.9.8
@@ -31395,7 +31513,6 @@
 2207022141 metadata/md5-cache/app-admin/gnome-abrt-1.4.2
 2207041640 metadata/md5-cache/app-admin/logstash-bin-6.8.23
 2207041640 metadata/md5-cache/app-admin/logstash-bin-7.17.3
-2207050610 metadata/md5-cache/app-admin/puppet-7.17.0
 2207050610 metadata/md5-cache/app-admin/puppet-agent-7.17.0
 2207050610 metadata/md5-cache/app-admin/puppetserver-7.8.0
 2207022141 metadata/md5-cache/app-admin/rex-1.13.3
@@ -31405,10 +31522,21 @@
 2207022340 metadata/md5-cache/app-admin/ryzen_monitor-1.0.5
 2207031410 metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205
 2207022141 metadata/md5-cache/app-admin/stow-2.3.1
-2207060840 metadata/md5-cache/app-admin/awscli-1.25.23
-2207071310 metadata/md5-cache/app-admin/awscli-1.25.24
-2207081110 metadata/md5-cache/app-admin/Manifest.gz
-2207081110 metadata/md5-cache/app-admin/awscli-1.25.25
+2207101440 metadata/md5-cache/app-admin/Manifest.gz
+2207100940 metadata/md5-cache/app-admin/awscli-1.25.17-r1
+2207091210 metadata/md5-cache/app-admin/awscli-1.25.26
+2207091540 metadata/md5-cache/app-admin/doctl-1.78.0
+2207092311 metadata/md5-cache/app-admin/fluentd-1.14.4
+2207092311 metadata/md5-cache/app-admin/mcollective-2.12.5
+2207092311 metadata/md5-cache/app-admin/puppet-5.5.22-r1
+2207092311 metadata/md5-cache/app-admin/puppet-5.5.22-r2
+2207092311 metadata/md5-cache/app-admin/puppet-7.16.0
+2207092311 metadata/md5-cache/app-admin/puppet-7.17.0
+2207092311 metadata/md5-cache/app-admin/puppet-lint-2.5.1
+2207092311 metadata/md5-cache/app-admin/puppet-lint-2.5.2
+2207101110 metadata/md5-cache/app-admin/pwgen-2.08-r1
+2207092311 metadata/md5-cache/app-admin/r10k-3.15.0
+2207092311 metadata/md5-cache/app-admin/r10k-3.7.0-r2
 2206272223 metadata/md5-cache/app-antivirus/lkrg-0.9.2
 2206272223 metadata/md5-cache/app-antivirus/lkrg-0.9.3
 2206291742 metadata/md5-cache/app-antivirus/clamav-0.103.6
@@ -31486,7 +31614,6 @@
 2206272223 metadata/md5-cache/app-arch/tarsync-0.2.1-r2
 2206272223 metadata/md5-cache/app-arch/tarsync-0.2.2
 2206281115 metadata/md5-cache/app-arch/tarsync-0.2.3
-2206272223 metadata/md5-cache/app-arch/unace-2.5-r5
 2206272223 metadata/md5-cache/app-arch/unar-1.10.7
 2206272223 metadata/md5-cache/app-arch/unp-2.0_pre9
 2206272223 metadata/md5-cache/app-arch/unrar-6.1.7
@@ -31500,7 +31627,6 @@
 2206281115 metadata/md5-cache/app-arch/zip-3.0-r4
 2206272223 metadata/md5-cache/app-arch/zoo-2.10-r5
 2206281115 metadata/md5-cache/app-arch/zopfli-1.0.3
-2206281115 metadata/md5-cache/app-arch/zpaq-7.15
 2206272223 metadata/md5-cache/app-arch/zpaq-extras-3
 2206281115 metadata/md5-cache/app-arch/zstd-1.4.9
 2206272223 metadata/md5-cache/app-arch/zstd-1.5.2
@@ -31524,14 +31650,12 @@
 2206291742 metadata/md5-cache/app-arch/pixz-9999
 2206292114 metadata/md5-cache/app-arch/tardelta-1.0.1
 2206291742 metadata/md5-cache/app-arch/torrentzip-0.9-r1
-2206291742 metadata/md5-cache/app-arch/unadf-0.7.12-r1
 2206292114 metadata/md5-cache/app-arch/unrpa-2.3.0
 2206292114 metadata/md5-cache/app-arch/vimball-0.5.1
 2206292114 metadata/md5-cache/app-arch/vimball-9999
 2206291742 metadata/md5-cache/app-arch/wimlib-1.13.4-r1
 2206291742 metadata/md5-cache/app-arch/xar-1.8.0.0.452
 2206291742 metadata/md5-cache/app-arch/xz-utils-9999
-2207050440 metadata/md5-cache/app-arch/Manifest.gz
 2207022340 metadata/md5-cache/app-arch/alien-8.95-r2
 2207022340 metadata/md5-cache/app-arch/bsdsfv-1.18-r3
 2207022141 metadata/md5-cache/app-arch/bzip2-9999
@@ -31551,6 +31675,10 @@
 2207031340 metadata/md5-cache/app-arch/stenc-1.1.1
 2207022340 metadata/md5-cache/app-arch/stuffit-5.2.0.611-r1
 2207022340 metadata/md5-cache/app-arch/tapeutils-0.4-r1
+2207101410 metadata/md5-cache/app-arch/Manifest.gz
+2207101410 metadata/md5-cache/app-arch/unace-2.5-r6
+2207101410 metadata/md5-cache/app-arch/unadf-0.7.12-r2
+2207101410 metadata/md5-cache/app-arch/zpaq-7.15-r1
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
@@ -31770,7 +31898,6 @@
 2203131340 metadata/md5-cache/app-crypt/mkp224o-1.5.0
 2203240726 metadata/md5-cache/app-crypt/gpa-0.10.0
 2203240726 metadata/md5-cache/app-crypt/xca-2.4.0-r2
-2204150511 metadata/md5-cache/app-crypt/age-1.0.0
 2204150511 metadata/md5-cache/app-crypt/cfssl-1.4.1
 2204150511 metadata/md5-cache/app-crypt/cfssl-1.6.0
 2204230009 metadata/md5-cache/app-crypt/gorilla-1.4-r2
@@ -31958,9 +32085,11 @@
 2207071940 metadata/md5-cache/app-crypt/certbot-nginx-1.29.0
 2207071940 metadata/md5-cache/app-crypt/certbot-nginx-9999
 2207062110 metadata/md5-cache/app-crypt/gnupg-2.2.35-r1
-2207081340 metadata/md5-cache/app-crypt/Manifest.gz
 2207081110 metadata/md5-cache/app-crypt/gnupg-2.2.36
-2207081340 metadata/md5-cache/app-crypt/signify-31
+2207100940 metadata/md5-cache/app-crypt/Manifest.gz
+2207100940 metadata/md5-cache/app-crypt/age-1.0.0
+2207091410 metadata/md5-cache/app-crypt/pgpdump-0.35
+2207091140 metadata/md5-cache/app-crypt/signify-31
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -32546,15 +32675,15 @@
 2206272223 metadata/md5-cache/app-dicts/dictd-wn-3.0_p33-r1
 2206281115 metadata/md5-cache/app-dicts/dikt-2s_p1
 2206272223 metadata/md5-cache/app-dicts/gwaei-3.6.2
-2206272223 metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
 2206291742 metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
 2206291742 metadata/md5-cache/app-dicts/libydpdict-1.0.4
 2206291742 metadata/md5-cache/app-dicts/wordnet-3.1-r1
 2206291742 metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
-2207031210 metadata/md5-cache/app-dicts/Manifest.gz
 2207022141 metadata/md5-cache/app-dicts/gnome-dictionary-40.0-r1
 2207022040 metadata/md5-cache/app-dicts/myspell-en-20220701
 2207031210 metadata/md5-cache/app-dicts/myspell-uk-5.8.0
+2207092311 metadata/md5-cache/app-dicts/Manifest.gz
+2207092311 metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
 2107020209 metadata/md5-cache/app-doc/blas-docs-3.1.1
 2104180939 metadata/md5-cache/app-doc/csound-manual-6.15-r1
 2104192309 metadata/md5-cache/app-doc/elisp-manual-18.1.03
@@ -32725,7 +32854,6 @@
 2206272223 metadata/md5-cache/app-editors/aee-2.2.21
 2206272223 metadata/md5-cache/app-editors/dav-0.8.5-r2
 2206272223 metadata/md5-cache/app-editors/dhex-0.69
-2206272223 metadata/md5-cache/app-editors/diakonos-0.9.7
 2206272223 metadata/md5-cache/app-editors/e3-2.8.2
 2206272223 metadata/md5-cache/app-editors/ee-1.5.2-r1
 2206272223 metadata/md5-cache/app-editors/elvis-2.2.0-r8
@@ -32842,12 +32970,14 @@
 2207060440 metadata/md5-cache/app-editors/gedit-plugins-42.1
 2207060440 metadata/md5-cache/app-editors/ghex-42.3
 2207060440 metadata/md5-cache/app-editors/gnome-latex-3.40.0
-2207072340 metadata/md5-cache/app-editors/Manifest.gz
 2207072340 metadata/md5-cache/app-editors/vim-8.2.5066-r1
 2207072340 metadata/md5-cache/app-editors/vim-9999
 2207072340 metadata/md5-cache/app-editors/vim-core-8.2.5066-r1
 2207072340 metadata/md5-cache/app-editors/vim-core-9999
 2207062340 metadata/md5-cache/app-editors/xemacs-21.5.34-r9
+2207092340 metadata/md5-cache/app-editors/Manifest.gz
+2207092311 metadata/md5-cache/app-editors/diakonos-0.9.7
+2207092340 metadata/md5-cache/app-editors/mousepad-0.5.10
 2204172340 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.8
@@ -33165,7 +33295,6 @@
 2204210039 metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
 2204210510 metadata/md5-cache/app-emacs/diminish-0.46_pre20220128
 2204210039 metadata/md5-cache/app-emacs/doctest-mode-0.4
-2204210039 metadata/md5-cache/app-emacs/emacs-daemon-0.22
 2204210039 metadata/md5-cache/app-emacs/eselect-mode-1.4.16
 2204210039 metadata/md5-cache/app-emacs/eselect-mode-1.4.17
 2204210039 metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
@@ -33243,7 +33372,6 @@
 2205230010 metadata/md5-cache/app-emacs/doom-themes-2.1.6_p20220505
 2205230310 metadata/md5-cache/app-emacs/esup-0.7.1_p20220203
 2205202210 metadata/md5-cache/app-emacs/org-mode-9.5.3-r1
-2205211140 metadata/md5-cache/app-emacs/vertico-0.23
 2205241540 metadata/md5-cache/app-emacs/ebib-2.35.1_p20220501
 2205240240 metadata/md5-cache/app-emacs/ivy-0.13.4
 2205241540 metadata/md5-cache/app-emacs/parsebib-3.1
@@ -33324,10 +33452,17 @@
 2207051540 metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.5.0
 2207041810 metadata/md5-cache/app-emacs/parsebib-4.1
 2207061310 metadata/md5-cache/app-emacs/helm-3.8.6
-2207072310 metadata/md5-cache/app-emacs/Manifest.gz
 2207071740 metadata/md5-cache/app-emacs/bbdb-3.2.2b
 2207072310 metadata/md5-cache/app-emacs/evil-1.14.2
 2207071110 metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220525
+2207101540 metadata/md5-cache/app-emacs/Manifest.gz
+2207101210 metadata/md5-cache/app-emacs/corfu-0.26
+2207101540 metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
+2207090240 metadata/md5-cache/app-emacs/emacs-eix-0.0.0
+2207090240 metadata/md5-cache/app-emacs/emacs-eix-9999
+2207090240 metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
+2207090240 metadata/md5-cache/app-emacs/emacs-openrc-9999
+2207101210 metadata/md5-cache/app-emacs/vertico-0.25
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -33391,8 +33526,6 @@
 2206272223 metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
 2206272223 metadata/md5-cache/app-emulation/spim-8.0-r3
 2206272223 metadata/md5-cache/app-emulation/uade-2.13-r2
-2206272223 metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
-2206272223 metadata/md5-cache/app-emulation/vagrant-2.2.19
 2206272223 metadata/md5-cache/app-emulation/vendor-reset-0.1.0
 2206272223 metadata/md5-cache/app-emulation/vendor-reset-9999
 2206272223 metadata/md5-cache/app-emulation/vice-3.6.1
@@ -33497,7 +33630,6 @@
 2207022141 metadata/md5-cache/app-emulation/vkd3d-proton-9999
 2207031840 metadata/md5-cache/app-emulation/wine-staging-7.12
 2207031840 metadata/md5-cache/app-emulation/wine-vanilla-7.12
-2207051940 metadata/md5-cache/app-emulation/xen-4.15.3
 2207051940 metadata/md5-cache/app-emulation/xen-4.16.1
 2207051940 metadata/md5-cache/app-emulation/xen-tools-4.16.1
 2207052110 metadata/md5-cache/app-emulation/protontricks-1.8.2
@@ -33505,9 +33637,12 @@
 2207061240 metadata/md5-cache/app-emulation/virtualbox-6.1.34-r5
 2207061210 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r2
 2207071010 metadata/md5-cache/app-emulation/xen-4.16.2_pre1
-2207062210 metadata/md5-cache/app-emulation/xen-tools-4.15.3
 2207071010 metadata/md5-cache/app-emulation/xen-tools-4.16.2_pre1
-2207081140 metadata/md5-cache/app-emulation/Manifest.gz
+2207100940 metadata/md5-cache/app-emulation/Manifest.gz
+2207092311 metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
+2207092311 metadata/md5-cache/app-emulation/vagrant-2.2.19
+2207100940 metadata/md5-cache/app-emulation/xen-4.15.3
+2207100940 metadata/md5-cache/app-emulation/xen-tools-4.15.3
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -33522,7 +33657,6 @@
 2111171139 metadata/md5-cache/app-eselect/eselect-ruby-20191222
 2107210239 metadata/md5-cache/app-eselect/eselect-ruby-20201225
 2008091909 metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.2
-2109021309 metadata/md5-cache/app-eselect/eselect-timidity-20110513
 2101170739 metadata/md5-cache/app-eselect/eselect-unison-0.4
 2002112051 metadata/md5-cache/app-eselect/eselect-wine-1.2.2
 2111292209 metadata/md5-cache/app-eselect/eselect-scala-0.1.1-r1
@@ -33552,15 +33686,16 @@
 2206282240 metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
 2206280511 metadata/md5-cache/app-eselect/eselect-notify-send-0.1
 2206272223 metadata/md5-cache/app-eselect/eselect-php-0.9.6
-2206292114 metadata/md5-cache/app-eselect/Manifest.gz
 2206291742 metadata/md5-cache/app-eselect/eselect-java-0.4.3
 2206291742 metadata/md5-cache/app-eselect/eselect-java-0.5.0
 2206291742 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999
 2206291742 metadata/md5-cache/app-eselect/eselect-php-0.9.7
 2206291742 metadata/md5-cache/app-eselect/eselect-php-9999
-2206292114 metadata/md5-cache/app-eselect/eselect-repository-12
 2206291742 metadata/md5-cache/app-eselect/eselect-rust-20210703
 2206291742 metadata/md5-cache/app-eselect/eselect-vi-1.2
+2207101440 metadata/md5-cache/app-eselect/Manifest.gz
+2207090910 metadata/md5-cache/app-eselect/eselect-repository-12
+2207101440 metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
 2201061240 metadata/md5-cache/app-forensics/air-2.0.0-r2
@@ -33676,8 +33811,6 @@
 2206281115 metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
 2206272223 metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
 2206281115 metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117
-2206272223 metadata/md5-cache/app-i18n/ibus-m17n-1.4.8
-2206272223 metadata/md5-cache/app-i18n/ibus-m17n-1.4.9
 2206272223 metadata/md5-cache/app-i18n/ibus-skk-1.4.3
 2206281115 metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
 2206281115 metadata/md5-cache/app-i18n/ibus-unikey-0.7.0_beta1
@@ -33719,8 +33852,6 @@
 2206292114 metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
 2206292114 metadata/md5-cache/app-i18n/ibus-table-1.16.8
 2206292114 metadata/md5-cache/app-i18n/ibus-table-1.16.9
-2206292114 metadata/md5-cache/app-i18n/ibus-typing-booster-2.15.25
-2206292114 metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
 2206292114 metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.7
 2206291742 metadata/md5-cache/app-i18n/im-chooser-1.7.0-r2
 2206291742 metadata/md5-cache/app-i18n/im-chooser-1.7.3
@@ -33769,8 +33900,11 @@
 2207022141 metadata/md5-cache/app-i18n/nkf-2.1.5
 2207051210 metadata/md5-cache/app-i18n/transifex-client-1.2.0
 2207022141 metadata/md5-cache/app-i18n/zinnia-0.06-r3
-2207071710 metadata/md5-cache/app-i18n/Manifest.gz
 2207071710 metadata/md5-cache/app-i18n/opencc-1.1.4
+2207090510 metadata/md5-cache/app-i18n/Manifest.gz
+2207090510 metadata/md5-cache/app-i18n/ibus-m17n-1.4.9
+2207090510 metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
+2207090510 metadata/md5-cache/app-i18n/ibus-typing-booster-2.17.0
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2206272223 metadata/md5-cache/app-laptop/hdapsd-20141203-r2
 2206282040 metadata/md5-cache/app-laptop/hdapsd-20141203-r3
@@ -33902,7 +34036,6 @@
 2202170040 metadata/md5-cache/app-misc/libdatovka-0.1.2-r1
 2202170040 metadata/md5-cache/app-misc/libdatovka-0.2.0-r1
 2203031839 metadata/md5-cache/app-misc/dtach-0.9-r1
-2203240726 metadata/md5-cache/app-misc/colordiff-1.0.18
 2203240726 metadata/md5-cache/app-misc/colordiff-1.0.19
 2203240726 metadata/md5-cache/app-misc/fmawk-1.2
 2203240726 metadata/md5-cache/app-misc/fmawk-1.3
@@ -33931,7 +34064,6 @@
 2205151140 metadata/md5-cache/app-misc/hello-2.11
 2205150610 metadata/md5-cache/app-misc/mkcert-1.4.4
 2205140210 metadata/md5-cache/app-misc/neofetch-7.1.0
-2205140210 metadata/md5-cache/app-misc/neofetch-7.1.0-r1
 2205140210 metadata/md5-cache/app-misc/neofetch-9999
 2205160310 metadata/md5-cache/app-misc/dasel-1.24.3
 2205160540 metadata/md5-cache/app-misc/jp-0.2.1
@@ -34270,8 +34402,6 @@
 2207022141 metadata/md5-cache/app-misc/g15daemon-9999
 2207022141 metadata/md5-cache/app-misc/geoclue-2.5.7
 2207022141 metadata/md5-cache/app-misc/gnote-42.0
-2207022141 metadata/md5-cache/app-misc/hivex-1.3.20
-2207022141 metadata/md5-cache/app-misc/hivex-1.3.21
 2207022141 metadata/md5-cache/app-misc/note-1.3.26
 2207031810 metadata/md5-cache/app-misc/pax-utils-1.3.4
 2207022141 metadata/md5-cache/app-misc/pfm-2.12.3-r1
@@ -34294,8 +34424,14 @@
 2207061040 metadata/md5-cache/app-misc/broot-1.14.0
 2207070840 metadata/md5-cache/app-misc/tracker-3.3.2
 2207062110 metadata/md5-cache/app-misc/yq-3.0.2
-2207081410 metadata/md5-cache/app-misc/Manifest.gz
-2207081410 metadata/md5-cache/app-misc/rbutil-1.5.1
+2207101440 metadata/md5-cache/app-misc/Manifest.gz
+2207082340 metadata/md5-cache/app-misc/ckb-0.5.0
+2207082340 metadata/md5-cache/app-misc/ckb-9999
+2207092311 metadata/md5-cache/app-misc/hivex-1.3.20
+2207092311 metadata/md5-cache/app-misc/hivex-1.3.21
+2207091340 metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+2207081510 metadata/md5-cache/app-misc/rbutil-1.5.1
+2207101440 metadata/md5-cache/app-misc/scrub-2.6.1-r1
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -34375,8 +34511,9 @@
 2207041640 metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
 2207041640 metadata/md5-cache/app-office/moneydance-2022.4060
 2207060340 metadata/md5-cache/app-office/unoconv-0.9.0-r1
-2207071410 metadata/md5-cache/app-office/Manifest.gz
 2207071410 metadata/md5-cache/app-office/kalendar-22.04.3
+2207091010 metadata/md5-cache/app-office/Manifest.gz
+2207091010 metadata/md5-cache/app-office/impressive-0.13.1
 2204011845 metadata/md5-cache/app-officeext/Manifest.gz
 2204011845 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2204011845 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -34488,8 +34625,6 @@
 2206292114 metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0
 2206292114 metadata/md5-cache/app-portage/recover-broken-vdb-9999
 2206291742 metadata/md5-cache/app-portage/repo-commit-9999
-2206292114 metadata/md5-cache/app-portage/repoman-3.0.3-r1
-2206292114 metadata/md5-cache/app-portage/repoman-9999
 2206292114 metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
 2206292114 metadata/md5-cache/app-portage/smart-live-rebuild-9999
 2206292114 metadata/md5-cache/app-portage/tatt-9999
@@ -34508,10 +34643,11 @@
 2207022141 metadata/md5-cache/app-portage/pram-10
 2207030610 metadata/md5-cache/app-portage/tatt-0.8
 2207030610 metadata/md5-cache/app-portage/tatt-0.9
-2207061210 metadata/md5-cache/app-portage/Manifest.gz
 2207061210 metadata/md5-cache/app-portage/iwdevtools-0.11.3
 2207061010 metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
 2207061010 metadata/md5-cache/app-portage/java-ebuilder-9999
+2207090910 metadata/md5-cache/app-portage/Manifest.gz
+2207090910 metadata/md5-cache/app-portage/repoman-3.0.3-r2
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -34519,7 +34655,6 @@
 2108271010 metadata/md5-cache/app-shells/liquidprompt-2.0.3
 2103052109 metadata/md5-cache/app-shells/localshell-1.3.4-r1
 1912110241 metadata/md5-cache/app-shells/pdsh-2.26-r1
-2104060140 metadata/md5-cache/app-shells/push-2.0-r1
 1907130039 metadata/md5-cache/app-shells/rush-2.1
 2201032109 metadata/md5-cache/app-shells/rush-2.2
 2202132309 metadata/md5-cache/app-shells/liquidprompt-2.0.4
@@ -34529,7 +34664,6 @@
 2204150511 metadata/md5-cache/app-shells/peco-0.5.8
 2204150940 metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
 2205090840 metadata/md5-cache/app-shells/push-3.4
-2205102010 metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
 2205102010 metadata/md5-cache/app-shells/zsh-completions-0.33.0
 2205102010 metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
 2206012140 metadata/md5-cache/app-shells/liquidprompt-2.1.1
@@ -34610,8 +34744,9 @@
 2207030610 metadata/md5-cache/app-shells/zsh-completions-0.34.0
 2207030610 metadata/md5-cache/app-shells/zsh-completions-9999
 2207071410 metadata/md5-cache/app-shells/tcsh-6.24.01
-2207081110 metadata/md5-cache/app-shells/Manifest.gz
-2207081110 metadata/md5-cache/app-shells/tcsh-6.24.00
+2207101540 metadata/md5-cache/app-shells/Manifest.gz
+2207101540 metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
+2207091540 metadata/md5-cache/app-shells/tcsh-6.24.00
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2111090809 metadata/md5-cache/app-text/bibclean-3.06
 2108250539 metadata/md5-cache/app-text/catdoc-0.95-r1
@@ -34672,7 +34807,6 @@
 2201260310 metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
 2201260310 metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
 2201260310 metadata/md5-cache/app-text/html401-19991224-r4
-2201260040 metadata/md5-cache/app-text/wdiff-1.2.2-r1
 2201260310 metadata/md5-cache/app-text/xhtml11-20101123
 2201281040 metadata/md5-cache/app-text/blogc-0.20.1
 2202070940 metadata/md5-cache/app-text/unpaper-6.1-r1
@@ -34782,7 +34916,6 @@
 2206272223 metadata/md5-cache/app-text/html2text-9999
 2206281115 metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
 2206272223 metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
-2206281115 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
 2206272223 metadata/md5-cache/app-text/htp-1.19
 2206272223 metadata/md5-cache/app-text/itex2mml-1.5.6
 2206272223 metadata/md5-cache/app-text/jo-1.4
@@ -34821,7 +34954,6 @@
 2206281115 metadata/md5-cache/app-text/podofo-0.9.7
 2206281115 metadata/md5-cache/app-text/poppler-22.05.0
 2206281115 metadata/md5-cache/app-text/poppler-22.06.0
-2206281115 metadata/md5-cache/app-text/poppler-9999
 2206272223 metadata/md5-cache/app-text/ps2eps-1.68
 2206272223 metadata/md5-cache/app-text/psiconv-0.8.3-r1
 2206272223 metadata/md5-cache/app-text/pspresent-1.3-r1
@@ -34837,10 +34969,6 @@
 2206272223 metadata/md5-cache/app-text/reed-5.4-r1
 2206272223 metadata/md5-cache/app-text/rman-3.2-r1
 2206272223 metadata/md5-cache/app-text/rnv-1.7.11-r1
-2206272223 metadata/md5-cache/app-text/ronn-0.7.3-r4
-2206272223 metadata/md5-cache/app-text/ronn-ng-0.9.1
-2206272223 metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
-2206272223 metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
 2206272223 metadata/md5-cache/app-text/scdoc-1.11.0
 2206272223 metadata/md5-cache/app-text/scdoc-1.11.1
 2206272223 metadata/md5-cache/app-text/scdoc-1.11.2-r1
@@ -34858,7 +34986,6 @@
 2206281115 metadata/md5-cache/app-text/tree-2.0.1
 2206272223 metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
 2206272223 metadata/md5-cache/app-text/u2ps-1.2
-2206272223 metadata/md5-cache/app-text/webgen-1.7.2
 2206272223 metadata/md5-cache/app-text/wscr-1.2-r2
 2206281115 metadata/md5-cache/app-text/wv2-0.4.2-r3
 2206281115 metadata/md5-cache/app-text/xchm-1.33
@@ -34910,7 +35037,6 @@
 2206292114 metadata/md5-cache/app-text/htmlmin-0.1.12-r1
 2206291742 metadata/md5-cache/app-text/hunspell-1.7.0-r2
 2206292114 metadata/md5-cache/app-text/iso-codes-4.9.0
-2206302110 metadata/md5-cache/app-text/kramdown-rfc-1.6.13
 2206291742 metadata/md5-cache/app-text/libebook-0.1.3-r2
 2206291742 metadata/md5-cache/app-text/libetonyek-9999
 2206291742 metadata/md5-cache/app-text/libmspub-0.1.4
@@ -34965,7 +35091,6 @@
 2206292114 metadata/md5-cache/app-text/sigil-1.8.0
 2206292114 metadata/md5-cache/app-text/sigil-1.9.2-r1
 2206291742 metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
-2206291742 metadata/md5-cache/app-text/t1utils-1.41-r2
 2206291742 metadata/md5-cache/app-text/teckit-2.5.10
 2206291742 metadata/md5-cache/app-text/tesseract-4.1.1
 2206291742 metadata/md5-cache/app-text/tesseract-5.0.1
@@ -34999,7 +35124,6 @@
 2207022141 metadata/md5-cache/app-text/grutatxt-2.200.0
 2207022141 metadata/md5-cache/app-text/gtranslator-40.0
 2207022141 metadata/md5-cache/app-text/htag-0.0.24-r1
-2207041640 metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
 2207041640 metadata/md5-cache/app-text/jabref-bin-3.7
 2207041640 metadata/md5-cache/app-text/jabref-bin-3.8
 2207041640 metadata/md5-cache/app-text/jabref-bin-3.8.1
@@ -35010,7 +35134,6 @@
 2207041640 metadata/md5-cache/app-text/jabref-bin-4.9999
 2207051240 metadata/md5-cache/app-text/jo-1.6
 2207051240 metadata/md5-cache/app-text/jo-9999
-2207031410 metadata/md5-cache/app-text/kramdown-rfc-1.6.11
 2207041910 metadata/md5-cache/app-text/krop-0.6.0-r1
 2207041910 metadata/md5-cache/app-text/krop-9999
 2207041640 metadata/md5-cache/app-text/languagetool-5.4
@@ -35052,8 +35175,21 @@
 2207022141 metadata/md5-cache/app-text/zathura-ps-9999
 2207060440 metadata/md5-cache/app-text/evince-42.3
 2207060440 metadata/md5-cache/app-text/iso-codes-4.10.0
-2207061510 metadata/md5-cache/app-text/Manifest.gz
 2207061510 metadata/md5-cache/app-text/zotero-bin-6.0.9
+2207101440 metadata/md5-cache/app-text/Manifest.gz
+2207092311 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+2207092311 metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
+2207092311 metadata/md5-cache/app-text/kramdown-rfc-1.6.11
+2207092311 metadata/md5-cache/app-text/kramdown-rfc-1.6.13
+2207090040 metadata/md5-cache/app-text/poppler-22.07.0
+2207090040 metadata/md5-cache/app-text/poppler-9999
+2207092311 metadata/md5-cache/app-text/ronn-0.7.3-r4
+2207092311 metadata/md5-cache/app-text/ronn-ng-0.9.1
+2207092311 metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
+2207092311 metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
+2207101440 metadata/md5-cache/app-text/wdiff-1.2.2-r2
+2207092311 metadata/md5-cache/app-text/webgen-1.7.2
+2207091940 metadata/md5-cache/app-text/xapian-omega-1.4.20
 2203240726 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35257,8 +35393,6 @@
 2206020710 metadata/md5-cache/app-vim/vim-go-1.20
 2206020710 metadata/md5-cache/app-vim/yankring-19.0-r1
 2206250010 metadata/md5-cache/app-vim/vspec-1.9.2
-2206272223 metadata/md5-cache/app-vim/command-t-5.0.3-r1
-2206292114 metadata/md5-cache/app-vim/Manifest.gz
 2206292114 metadata/md5-cache/app-vim/gundo-2.6.2-r3
 2206292114 metadata/md5-cache/app-vim/iris-1.0.0
 2206292114 metadata/md5-cache/app-vim/jedi-0.11.0
@@ -35270,6 +35404,8 @@
 2206292114 metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
 2206292114 metadata/md5-cache/app-vim/vimpython-1.13-r3
 2206292114 metadata/md5-cache/app-vim/voom-5.3-r1
+2207092311 metadata/md5-cache/app-vim/Manifest.gz
+2207092311 metadata/md5-cache/app-vim/command-t-5.0.3-r1
 2203240726 metadata/md5-cache/app-xemacs/apel-1.36
 2203240726 metadata/md5-cache/app-xemacs/debug-1.20
 2203240726 metadata/md5-cache/app-xemacs/ecb-1.25
@@ -35572,8 +35708,9 @@
 2207080410 metadata/md5-cache/dev-cpp/folly-2022.03.28.00-r1
 2207080410 metadata/md5-cache/dev-cpp/folly-2022.04.11.00-r1
 2207071710 metadata/md5-cache/dev-cpp/glog-0.6.0
-2207081010 metadata/md5-cache/dev-cpp/Manifest.gz
 2207081010 metadata/md5-cache/dev-cpp/asio-1.10.8
+2207090740 metadata/md5-cache/dev-cpp/Manifest.gz
+2207090740 metadata/md5-cache/dev-cpp/folly-2022.07.04.00
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -35756,7 +35893,6 @@
 2206292114 metadata/md5-cache/dev-db/postgresql-14.4
 2206292114 metadata/md5-cache/dev-db/postgresql-9999
 2206291742 metadata/md5-cache/dev-db/redis-6.2.7-r1
-2206291742 metadata/md5-cache/dev-db/redis-7.0.2
 2206291742 metadata/md5-cache/dev-db/sqlcipher-4.5.1
 2206291742 metadata/md5-cache/dev-db/sqlite-3.38.2
 2206291742 metadata/md5-cache/dev-db/sqlite-3.38.5
@@ -35792,18 +35928,18 @@
 2207022141 metadata/md5-cache/dev-db/pgFormatter-5.1
 2207022141 metadata/md5-cache/dev-db/pgbadger-11.5
 2207022141 metadata/md5-cache/dev-db/pgbadger-11.8
-2207041640 metadata/md5-cache/dev-db/qdbm-1.8.78-r3
-2207021810 metadata/md5-cache/dev-db/redis-5.0.14
 2207021810 metadata/md5-cache/dev-db/redis-6.0.16
 2207021810 metadata/md5-cache/dev-db/redis-6.2.6
-2207041340 metadata/md5-cache/dev-db/redis-7.0.1-r1
 2207051310 metadata/md5-cache/dev-db/sqlcl-bin-22.2.0.172.1718
 2207041640 metadata/md5-cache/dev-db/sqldeveloper-21.4.3.063.0100
 2207030310 metadata/md5-cache/dev-db/sqlmap-1.6.6
 2207030010 metadata/md5-cache/dev-db/tora-3.2-r2
-2207061040 metadata/md5-cache/dev-db/Manifest.gz
 2207061010 metadata/md5-cache/dev-db/apgdiff-2.7.0
 2207061040 metadata/md5-cache/dev-db/postgresql-15_beta2
+2207101610 metadata/md5-cache/dev-db/Manifest.gz
+2207092311 metadata/md5-cache/dev-db/qdbm-1.8.78-r3
+2207091110 metadata/md5-cache/dev-db/redis-7.0.1-r1
+2207091110 metadata/md5-cache/dev-db/redis-7.0.2
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
@@ -35893,8 +36029,9 @@
 2207041640 metadata/md5-cache/dev-embedded/arduino-1.8.19
 2207041640 metadata/md5-cache/dev-embedded/arduino-1.8.7
 2207041640 metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
-2207071310 metadata/md5-cache/dev-embedded/Manifest.gz
 2207071310 metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
+2207101110 metadata/md5-cache/dev-embedded/Manifest.gz
+2207101110 metadata/md5-cache/dev-embedded/avrdude-7.0
 2206101310 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2206101310 metadata/md5-cache/dev-erlang/cache_tab-1.0.29
 2206101310 metadata/md5-cache/dev-erlang/eimp-1.0.21
@@ -37035,11 +37172,6 @@
 2207061010 metadata/md5-cache/dev-java/batik-1.14-r1
 2207061010 metadata/md5-cache/dev-java/bcel-6.5.0
 2207061010 metadata/md5-cache/dev-java/bcel-6.5.0-r3
-2207061010 metadata/md5-cache/dev-java/bcmail-1.69-r1
-2207061010 metadata/md5-cache/dev-java/bcpg-1.69
-2207061010 metadata/md5-cache/dev-java/bcpkix-1.69
-2207061010 metadata/md5-cache/dev-java/bcprov-1.69
-2207061010 metadata/md5-cache/dev-java/bcutil-1.69
 2207061010 metadata/md5-cache/dev-java/brotli-dec-0.1.2
 2207061010 metadata/md5-cache/dev-java/cal10n-0.8.1
 2207061010 metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -37124,7 +37256,6 @@
 2207061010 metadata/md5-cache/dev-java/java-dep-check-0.5
 2207061010 metadata/md5-cache/dev-java/java-diff-utils-1.3.0
 2207061010 metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
-2207061010 metadata/md5-cache/dev-java/javassist-3.29.0
 2207061010 metadata/md5-cache/dev-java/javax-inject-1-r4
 2207061010 metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
 2207061010 metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -37147,7 +37278,6 @@
 2207061010 metadata/md5-cache/dev-java/jdbc-postgresql-42.4.0
 2207061010 metadata/md5-cache/dev-java/jdom-2.0.6.1
 2207061010 metadata/md5-cache/dev-java/jeromq-0.5.2
-2207061010 metadata/md5-cache/dev-java/jffi-1.3.6
 2207061010 metadata/md5-cache/dev-java/jflex-1.6.1-r1
 2207061010 metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
 2207061010 metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -37160,7 +37290,6 @@
 2207061010 metadata/md5-cache/dev-java/jnacl-1.0
 2207061010 metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
 2207061010 metadata/md5-cache/dev-java/jnr-constants-0.10.3
-2207061010 metadata/md5-cache/dev-java/jnr-ffi-2.2.8
 2207061010 metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
 2207061010 metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
 2207061010 metadata/md5-cache/dev-java/joda-time-2.10.10-r1
@@ -37244,12 +37373,9 @@
 2207061010 metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
 2207061010 metadata/md5-cache/dev-java/testng-6.9.10-r1
 2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
-2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
 2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
 2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
-2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
 2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
-2207061010 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
 2207061010 metadata/md5-cache/dev-java/treelayout-1.0.3-r1
 2207061010 metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
 2207061010 metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -37262,8 +37388,6 @@
 2207061010 metadata/md5-cache/dev-java/xerces-2.12.2
 2207061010 metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
 2207061010 metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
-2207061010 metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
-2207061010 metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
 2207061010 metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
 2207061010 metadata/md5-cache/dev-java/xmpbox-2.0.26
 2207061010 metadata/md5-cache/dev-java/xom-1.3.7
@@ -37272,11 +37396,6 @@
 2207061010 metadata/md5-cache/dev-java/xsdlib-2013.6.1
 2207061010 metadata/md5-cache/dev-java/xz-java-1.9
 2207061010 metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
-2207070940 metadata/md5-cache/dev-java/bcmail-1.71
-2207070940 metadata/md5-cache/dev-java/bcpg-1.71
-2207070940 metadata/md5-cache/dev-java/bcpkix-1.71-r1
-2207070940 metadata/md5-cache/dev-java/bcprov-1.71-r1
-2207070940 metadata/md5-cache/dev-java/bcutil-1.71
 2207071740 metadata/md5-cache/dev-java/byte-buddy-1.12.10
 2207071740 metadata/md5-cache/dev-java/byte-buddy-agent-1.12.10
 2207071010 metadata/md5-cache/dev-java/javax-jms-api-2.0.3
@@ -37288,11 +37407,22 @@
 2207071740 metadata/md5-cache/dev-java/mockito-4.6.0
 2207071010 metadata/md5-cache/dev-java/osgi-annotation-8.1.0
 2207071010 metadata/md5-cache/dev-java/osgi-core-8.0.0
-2207081010 metadata/md5-cache/dev-java/Manifest.gz
-2207081010 metadata/md5-cache/dev-java/jffi-1.3.9
-2207081010 metadata/md5-cache/dev-java/jnr-ffi-2.2.12
-2207081010 metadata/md5-cache/dev-java/jnr-netdb-1.2.0
-2207081010 metadata/md5-cache/dev-java/jnr-posix-3.1.15
+2207101540 metadata/md5-cache/dev-java/Manifest.gz
+2207091540 metadata/md5-cache/dev-java/bcmail-1.71
+2207091540 metadata/md5-cache/dev-java/bcpg-1.71
+2207091540 metadata/md5-cache/dev-java/bcpkix-1.71-r1
+2207091540 metadata/md5-cache/dev-java/bcprov-1.71-r1
+2207091540 metadata/md5-cache/dev-java/bcutil-1.71
+2207092110 metadata/md5-cache/dev-java/javassist-3.29.0
+2207091510 metadata/md5-cache/dev-java/jffi-1.3.6
+2207091310 metadata/md5-cache/dev-java/jffi-1.3.9
+2207091310 metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+2207091310 metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+2207091310 metadata/md5-cache/dev-java/jnr-posix-3.1.15
+2207101540 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
+2207101540 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
+2207101540 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
+2207091410 metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -37303,7 +37433,6 @@
 2110220439 metadata/md5-cache/dev-lang/nasm-2.15.05
 2011142339 metadata/md5-cache/dev-lang/open-cobol-1.1
 2107140739 metadata/md5-cache/dev-lang/parrot-8.1.0-r4
-2101062239 metadata/md5-cache/dev-lang/swig-3.0.12
 2111221709 metadata/md5-cache/dev-lang/elixir-1.11.4
 2111221709 metadata/md5-cache/dev-lang/elixir-1.11.4-r1
 2111221709 metadata/md5-cache/dev-lang/elixir-1.12.1
@@ -37461,7 +37590,6 @@
 2206291742 metadata/md5-cache/dev-lang/pcc-1.1.0-r1
 2206291742 metadata/md5-cache/dev-lang/php-7.4.30
 2206291742 metadata/md5-cache/dev-lang/php-8.0.20
-2206291742 metadata/md5-cache/dev-lang/php-8.1.7
 2206291742 metadata/md5-cache/dev-lang/polyml-5.8
 2206291742 metadata/md5-cache/dev-lang/polyml-5.8.2
 2206292114 metadata/md5-cache/dev-lang/python-2.7.18_p15
@@ -37499,11 +37627,6 @@
 2207041640 metadata/md5-cache/dev-lang/clojure-1.11.1
 2207041640 metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
 2207041640 metadata/md5-cache/dev-lang/cxprolog-0.98.2
-2207041640 metadata/md5-cache/dev-lang/erlang-23.3.4.12
-2207041640 metadata/md5-cache/dev-lang/erlang-23.3.4.14-r1
-2207041640 metadata/md5-cache/dev-lang/erlang-24.3.3
-2207041640 metadata/md5-cache/dev-lang/erlang-24.3.4
-2207041640 metadata/md5-cache/dev-lang/erlang-25.0
 2207040340 metadata/md5-cache/dev-lang/ghc-9.0.2
 2207041640 metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
 2207022040 metadata/md5-cache/dev-lang/icon-9.5.21b
@@ -37541,10 +37664,17 @@
 2207041640 metadata/md5-cache/dev-lang/xsb-3.8.0
 2207041640 metadata/md5-cache/dev-lang/xsb-4.0.0
 2207061610 metadata/md5-cache/dev-lang/eisl-2.50
-2207072240 metadata/md5-cache/dev-lang/Manifest.gz
 2207072240 metadata/md5-cache/dev-lang/php-8.0.21
-2207072240 metadata/md5-cache/dev-lang/php-8.1.8
 2207061940 metadata/md5-cache/dev-lang/python-3.11.0_beta3_p1
+2207101110 metadata/md5-cache/dev-lang/Manifest.gz
+2207091140 metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1
+2207091240 metadata/md5-cache/dev-lang/erlang-23.3.4.15
+2207091140 metadata/md5-cache/dev-lang/erlang-24.3.3-r1
+2207091240 metadata/md5-cache/dev-lang/erlang-24.3.4.2
+2207091140 metadata/md5-cache/dev-lang/erlang-25.0-r1
+2207091240 metadata/md5-cache/dev-lang/erlang-25.0.2
+2207091540 metadata/md5-cache/dev-lang/php-8.1.8
+2207081640 metadata/md5-cache/dev-lang/python-3.11.0_beta3_p2
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
 2105240639 metadata/md5-cache/dev-libs/bemenu-0.6.1
@@ -37573,7 +37703,6 @@
 2104060140 metadata/md5-cache/dev-libs/liblzw-0.2-r1
 2102190539 metadata/md5-cache/dev-libs/liblzw-0.3
 2109291109 metadata/md5-cache/dev-libs/libmaa-1.3.2
-2003031839 metadata/md5-cache/dev-libs/libmodbus-3.1.6
 2110121209 metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
 2106180139 metadata/md5-cache/dev-libs/libp11-0.4.10-r1
 2011160239 metadata/md5-cache/dev-libs/libpo6-0.8.0
@@ -37632,7 +37761,6 @@
 2205311240 metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
 2205311240 metadata/md5-cache/dev-libs/vala-common-0.56.1
 2206021040 metadata/md5-cache/dev-libs/libpipeline-1.5.6
-2206061240 metadata/md5-cache/dev-libs/libmodbus-3.1.7
 2206072340 metadata/md5-cache/dev-libs/linux-syscall-support-2021.05.03
 2206151140 metadata/md5-cache/dev-libs/libksba-1.6.0
 2206200940 metadata/md5-cache/dev-libs/pocketfft-2021.11.23
@@ -37728,8 +37856,6 @@
 2206281115 metadata/md5-cache/dev-libs/igraph-0.9.2
 2206281115 metadata/md5-cache/dev-libs/igraph-0.9.4
 2206281115 metadata/md5-cache/dev-libs/iniparser-4.1
-2206281115 metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
-2206281115 metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
 2206281115 metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405
 2206282310 metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
 2206282310 metadata/md5-cache/dev-libs/intel-compute-runtime-22.25.23529
@@ -37890,12 +38016,10 @@
 2206281115 metadata/md5-cache/dev-libs/log4cplus-2.0.7
 2206272223 metadata/md5-cache/dev-libs/lzo-2.10
 2206281115 metadata/md5-cache/dev-libs/metee-3.1.3
-2206281115 metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
 2206281115 metadata/md5-cache/dev-libs/mimalloc-2.0.6
 2206281115 metadata/md5-cache/dev-libs/miniz-2.1.0-r3
 2206281115 metadata/md5-cache/dev-libs/miniz-2.2.0
 2206281115 metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
-2206281115 metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
 2206272223 metadata/md5-cache/dev-libs/mpc-1.2.1
 2206272223 metadata/md5-cache/dev-libs/mpfr-4.1.0-r1
 2206272223 metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1
@@ -38114,7 +38238,6 @@
 2206272223 metadata/md5-cache/dev-libs/zlog-1.2.15
 2206291742 metadata/md5-cache/dev-libs/9libs-1.0-r4
 2206292114 metadata/md5-cache/dev-libs/FP16-2021.03.20-r2
-2206292114 metadata/md5-cache/dev-libs/Ice-3.6.5-r2
 2206291742 metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
 2206291742 metadata/md5-cache/dev-libs/apr-1.6.3-r7
 2206291742 metadata/md5-cache/dev-libs/apr-1.6.5-r4
@@ -38161,7 +38284,6 @@
 2206291742 metadata/md5-cache/dev-libs/hidapi-0.11.0
 2206291742 metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
 2206291742 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
-2206292114 metadata/md5-cache/dev-libs/hyperscan-5.4.0
 2206292114 metadata/md5-cache/dev-libs/icu-71.1-r1
 2206291742 metadata/md5-cache/dev-libs/icu-layoutex-71.1
 2206291742 metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
@@ -38226,8 +38348,6 @@
 2206291742 metadata/md5-cache/dev-libs/libev-4.33
 2206291742 metadata/md5-cache/dev-libs/libevent-2.1.9999
 2206291742 metadata/md5-cache/dev-libs/libevent-9999
-2206291742 metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
-2206291742 metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
 2206291742 metadata/md5-cache/dev-libs/libfstrcmp-0.7
 2206291742 metadata/md5-cache/dev-libs/libfstrcmp-0.7-r1
 2206291742 metadata/md5-cache/dev-libs/libfstrcmp-0.7-r3
@@ -38254,7 +38374,6 @@
 2206292114 metadata/md5-cache/dev-libs/libixion-9999
 2206291742 metadata/md5-cache/dev-libs/liblogging-1.0.6
 2206291742 metadata/md5-cache/dev-libs/liblogging-1.0.6-r1
-2206291742 metadata/md5-cache/dev-libs/liblognorm-2.0.6
 2206292114 metadata/md5-cache/dev-libs/liblouis-3.13.0
 2206292114 metadata/md5-cache/dev-libs/liblouis-3.17.0
 2206292114 metadata/md5-cache/dev-libs/liblouis-3.20.0
@@ -38484,8 +38603,6 @@
 2207030210 metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r4
 2207031210 metadata/md5-cache/dev-libs/miniz-2.2.0-r1
 2207020540 metadata/md5-cache/dev-libs/ncnn-20220701
-2207022141 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
-2207022141 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
 2207021540 metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r101
 2207031410 metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.0.2-r1
 2207022141 metadata/md5-cache/dev-libs/stfl-0.24-r4
@@ -38501,8 +38618,6 @@
 2207022141 metadata/md5-cache/dev-libs/weston-10.0.0
 2207022141 metadata/md5-cache/dev-libs/weston-10.0.1
 2207022141 metadata/md5-cache/dev-libs/weston-9999
-2207041640 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
-2207041640 metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
 2207060440 metadata/md5-cache/dev-libs/glib-2.72.2
 2207060440 metadata/md5-cache/dev-libs/gmime-3.2.12
 2207060440 metadata/md5-cache/dev-libs/libgit2-1.3.1
@@ -38511,7 +38626,6 @@
 2207060140 metadata/md5-cache/dev-libs/openssl-3.0.5
 2207061540 metadata/md5-cache/dev-libs/libfmt-9.0.0
 2207061540 metadata/md5-cache/dev-libs/libfmt-9999
-2207072310 metadata/md5-cache/dev-libs/Manifest.gz
 2207071340 metadata/md5-cache/dev-libs/capnproto-0.10.2
 2207070940 metadata/md5-cache/dev-libs/castxml-0.4.5
 2207072310 metadata/md5-cache/dev-libs/elfutils-0.187
@@ -38525,6 +38639,26 @@
 2207071710 metadata/md5-cache/dev-libs/oniguruma-9999
 2207071240 metadata/md5-cache/dev-libs/urdfdom-3.1.0
 2207071240 metadata/md5-cache/dev-libs/urdfdom_headers-1.1.0
+2207092311 metadata/md5-cache/dev-libs/Ice-3.6.5-r2
+2207101610 metadata/md5-cache/dev-libs/Manifest.gz
+2207091110 metadata/md5-cache/dev-libs/hyperscan-5.4.0
+2207100040 metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
+2207090710 metadata/md5-cache/dev-libs/libcdada-0.4.0
+2207090640 metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
+2207090640 metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
+2207091410 metadata/md5-cache/dev-libs/liblognorm-2.0.6
+2207100040 metadata/md5-cache/dev-libs/libmodbus-3.1.7
+2207091410 metadata/md5-cache/dev-libs/libstrophe-0.12.1
+2207091540 metadata/md5-cache/dev-libs/libtpms-0.9.5
+2207091810 metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
+2207100940 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
+2207101610 metadata/md5-cache/dev-libs/qcoro5-0.6.0
+2207101210 metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
+2207100310 metadata/md5-cache/dev-libs/wayland-protocols-1.26
+2207091910 metadata/md5-cache/dev-libs/xapian-1.4.20
+2207092311 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+2207092311 metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
+2207092311 metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2205132310 metadata/md5-cache/dev-lisp/alexandria-1.4
 2205150110 metadata/md5-cache/dev-lisp/asdf-3.3.5
@@ -40008,7 +40142,6 @@
 2207022141 metadata/md5-cache/dev-perl/Mail-Sendmail-0.800.0-r1
 2207022141 metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
 2207022141 metadata/md5-cache/dev-perl/MailTools-2.210.0
-2207050240 metadata/md5-cache/dev-perl/Manifest.gz
 2207022141 metadata/md5-cache/dev-perl/Math-Base-Convert-0.110.0-r1
 2207022141 metadata/md5-cache/dev-perl/Math-Base36-0.140.0-r1
 2207022141 metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r2
@@ -40882,6 +41015,9 @@
 2207022141 metadata/md5-cache/dev-perl/syntax-0.4.0-r2
 2207022141 metadata/md5-cache/dev-perl/tkispell-0.200.0
 2207022141 metadata/md5-cache/dev-perl/txt2html-2.530.0
+2207090910 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.330.0
+2207090910 metadata/md5-cache/dev-perl/Manifest.gz
+2207090910 metadata/md5-cache/dev-perl/URI-5.110.0
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2101072209 metadata/md5-cache/dev-php/File_Iterator-2.0.2-r1
 2108131009 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -41337,7 +41473,6 @@
 2206292114 metadata/md5-cache/dev-python/aesara-2.6.6
 2206292114 metadata/md5-cache/dev-python/aesara-2.7.0
 2206292114 metadata/md5-cache/dev-python/aesara-2.7.1
-2206292114 metadata/md5-cache/dev-python/aesara-2.7.3
 2206292114 metadata/md5-cache/dev-python/agate-1.6.3-r2
 2206292114 metadata/md5-cache/dev-python/agate-dbf-0.2.2-r1
 2206292114 metadata/md5-cache/dev-python/agate-excel-0.2.5-r1
@@ -41456,15 +41591,7 @@
 2206292114 metadata/md5-cache/dev-python/boolean-py-4.0
 2206292114 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
 2206292114 metadata/md5-cache/dev-python/boto-2.49.0-r4
-2206292140 metadata/md5-cache/dev-python/boto3-1.24.12
-2206292114 metadata/md5-cache/dev-python/boto3-1.24.17
-2206300740 metadata/md5-cache/dev-python/boto3-1.24.20
-2207011010 metadata/md5-cache/dev-python/boto3-1.24.21
 2206292114 metadata/md5-cache/dev-python/boto3-9999
-2206292140 metadata/md5-cache/dev-python/botocore-1.27.12
-2206292114 metadata/md5-cache/dev-python/botocore-1.27.17
-2206300740 metadata/md5-cache/dev-python/botocore-1.27.20
-2207011010 metadata/md5-cache/dev-python/botocore-1.27.21
 2206300740 metadata/md5-cache/dev-python/botocore-9999
 2206292114 metadata/md5-cache/dev-python/bottle-0.12.21
 2206292114 metadata/md5-cache/dev-python/bottleneck-1.3.4
@@ -41891,7 +42018,6 @@
 2206292114 metadata/md5-cache/dev-python/ipykernel-6.13.1
 2206292114 metadata/md5-cache/dev-python/ipykernel-6.14.0
 2206292114 metadata/md5-cache/dev-python/ipykernel-6.15.0
-2206292114 metadata/md5-cache/dev-python/ipyparallel-8.2.1
 2206292114 metadata/md5-cache/dev-python/ipyparallel-8.4.1
 2206292114 metadata/md5-cache/dev-python/ipython-8.3.0-r1
 2206292114 metadata/md5-cache/dev-python/ipython-8.4.0
@@ -42238,8 +42364,6 @@
 2206292114 metadata/md5-cache/dev-python/pbkdf2-1.3-r2
 2206292114 metadata/md5-cache/dev-python/pbr-5.9.0
 2206292114 metadata/md5-cache/dev-python/pdfrw-0.4_p1
-2206292114 metadata/md5-cache/dev-python/pdm-pep517-0.12.7
-2206292114 metadata/md5-cache/dev-python/pdm-pep517-1.0.0
 2206292114 metadata/md5-cache/dev-python/pdoc3-0.10.0
 2206292114 metadata/md5-cache/dev-python/pebble-4.6.3
 2206292114 metadata/md5-cache/dev-python/pecan-1.4.1
@@ -42857,9 +42981,6 @@
 2206292114 metadata/md5-cache/dev-python/speg-0.3-r3
 2206292114 metadata/md5-cache/dev-python/speg-0.3_p20180819-r1
 2206292114 metadata/md5-cache/dev-python/sphinx-4.5.0-r1
-2206292114 metadata/md5-cache/dev-python/sphinx-5.0.0
-2206292114 metadata/md5-cache/dev-python/sphinx-5.0.1
-2206292114 metadata/md5-cache/dev-python/sphinx-5.0.2
 2206292114 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
 2206292114 metadata/md5-cache/dev-python/sphinx-autoapi-1.8.4
 2206292114 metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.18.1
@@ -43236,7 +43357,6 @@
 2207041010 metadata/md5-cache/dev-python/paramiko-2.11.0
 2207032240 metadata/md5-cache/dev-python/pdm-pep517-1.0.1
 2207030710 metadata/md5-cache/dev-python/pecan-1.4.2
-2207020810 metadata/md5-cache/dev-python/phonenumbers-8.12.51
 2207042140 metadata/md5-cache/dev-python/pikepdf-5.3.0
 2207051210 metadata/md5-cache/dev-python/pipenv-2022.6.7-r1
 2207021940 metadata/md5-cache/dev-python/plotly-5.8.2
@@ -43313,18 +43433,13 @@
 2207052110 metadata/md5-cache/dev-python/python-lsp-server-1.4.1-r1
 2207052310 metadata/md5-cache/dev-python/pyzotero-1.5.5
 2207052240 metadata/md5-cache/dev-python/tinycss2-1.1.1-r1
-2207060840 metadata/md5-cache/dev-python/boto3-1.24.23
-2207060840 metadata/md5-cache/dev-python/botocore-1.27.23
 2207060840 metadata/md5-cache/dev-python/dogpile-cache-1.1.7
-2207060910 metadata/md5-cache/dev-python/ipyparallel-8.3.0
 2207060840 metadata/md5-cache/dev-python/jc-1.20.2
 2207060910 metadata/md5-cache/dev-python/jupyter_server-1.17.0
 2207060910 metadata/md5-cache/dev-python/jupyter_server-1.18.1
 2207060840 metadata/md5-cache/dev-python/mmtf-python-1.1.3
 2207060910 metadata/md5-cache/dev-python/pip-run-8.8.1
 2207072240 metadata/md5-cache/dev-python/ansi2html-1.8.0
-2207071310 metadata/md5-cache/dev-python/boto3-1.24.24
-2207071310 metadata/md5-cache/dev-python/botocore-1.27.24
 2207061840 metadata/md5-cache/dev-python/catkin_pkg-0.5.2
 2207061840 metadata/md5-cache/dev-python/catkin_pkg-9999
 2207062010 metadata/md5-cache/dev-python/cython-0.29.30
@@ -43352,12 +43467,53 @@
 2207071140 metadata/md5-cache/dev-python/tomlkit-0.11.1
 2207072240 metadata/md5-cache/dev-python/urllib3-1.26.10
 2207081110 metadata/md5-cache/dev-python/Faker-13.15.0
-2207081140 metadata/md5-cache/dev-python/Manifest.gz
-2207081110 metadata/md5-cache/dev-python/boto3-1.24.25
-2207081110 metadata/md5-cache/dev-python/botocore-1.27.25
 2207081110 metadata/md5-cache/dev-python/debugpy-1.6.2
 2207081140 metadata/md5-cache/dev-python/nuitka-0.9.4
 2207081110 metadata/md5-cache/dev-python/weasyprint-56.0
+2207101540 metadata/md5-cache/dev-python/Manifest.gz
+2207091210 metadata/md5-cache/dev-python/PyPDF2-2.4.2
+2207101540 metadata/md5-cache/dev-python/aesara-2.7.3
+2207101440 metadata/md5-cache/dev-python/aesara-2.7.5
+2207091940 metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
+2207092110 metadata/md5-cache/dev-python/astroid-2.12.0
+2207091210 metadata/md5-cache/dev-python/autobahn-22.6.1
+2207092110 metadata/md5-cache/dev-python/bibtexparser-1.3.0
+2207091440 metadata/md5-cache/dev-python/boto3-1.24.17
+2207091210 metadata/md5-cache/dev-python/boto3-1.24.26
+2207091440 metadata/md5-cache/dev-python/botocore-1.27.17
+2207091210 metadata/md5-cache/dev-python/botocore-1.27.26
+2207091140 metadata/md5-cache/dev-python/canonicaljson-1.6.2
+2207091210 metadata/md5-cache/dev-python/cfn-lint-0.61.2
+2207091210 metadata/md5-cache/dev-python/cryptography-37.0.4
+2207091210 metadata/md5-cache/dev-python/dask-2022.7.0
+2207081940 metadata/md5-cache/dev-python/docutils-glep-1.3
+2207091340 metadata/md5-cache/dev-python/docutils-glep-1.4
+2207091210 metadata/md5-cache/dev-python/dogpile-cache-1.1.8
+2207101440 metadata/md5-cache/dev-python/ecdsa-0.18.0
+2207091140 metadata/md5-cache/dev-python/frozendict-2.3.2
+2207091210 metadata/md5-cache/dev-python/hypothesis-6.50.0
+2207092110 metadata/md5-cache/dev-python/hypothesis-6.50.1
+2207090810 metadata/md5-cache/dev-python/imapclient-2.3.1
+2207092110 metadata/md5-cache/dev-python/inflect-5.6.1
+2207091210 metadata/md5-cache/dev-python/ipykernel-6.15.1
+2207091340 metadata/md5-cache/dev-python/ipyparallel-8.3.0
+2207091210 metadata/md5-cache/dev-python/jupyter_core-4.11.1
+2207091210 metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
+2207091210 metadata/md5-cache/dev-python/kaitaistruct-0.10
+2207091140 metadata/md5-cache/dev-python/matrix-common-1.2.1
+2207090710 metadata/md5-cache/dev-python/numpy-1.23.1
+2207101440 metadata/md5-cache/dev-python/pdm-pep517-1.0.2
+2207091410 metadata/md5-cache/dev-python/phonenumbers-8.12.51
+2207090440 metadata/md5-cache/dev-python/pychromecast-12.1.4
+2207091140 metadata/md5-cache/dev-python/pymacaroons-0.13.0
+2207091210 metadata/md5-cache/dev-python/regex-2022.7.9
+2207091210 metadata/md5-cache/dev-python/setuptools-rust-1.4.1
+2207091340 metadata/md5-cache/dev-python/signedjson-1.1.4
+2207092140 metadata/md5-cache/dev-python/sphinx-5.0.2
+2207091210 metadata/md5-cache/dev-python/spyder-kernels-2.3.2
+2207091210 metadata/md5-cache/dev-python/tldextract-3.3.1
+2207101440 metadata/md5-cache/dev-python/toolz-0.12.0
+2207091140 metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
 2206272223 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2206272223 metadata/md5-cache/dev-qt/qt-creator-9999
 2206272223 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
@@ -44620,1168 +44776,1168 @@
 2207071340 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.13.1
 2207071340 metadata/md5-cache/dev-ros/visp_tracker-0.13.1
 2207071340 metadata/md5-cache/dev-ros/visp_tracker-9999
-2206272223 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
-2206272223 metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
-2206272223 metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
-2206272223 metadata/md5-cache/dev-ruby/acme-client-2.0.8
-2206272223 metadata/md5-cache/dev-ruby/acme-client-2.0.9
-2206272223 metadata/md5-cache/dev-ruby/actioncable-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/actioncable-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actioncable-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actioncable-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actionmailer-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/actionpack-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actionpack-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actionpack-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
-2206272223 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
-2206272223 metadata/md5-cache/dev-ruby/actiontext-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actiontext-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actiontext-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/actionview-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/actionview-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/actionview-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/actionview-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/actionview-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/activejob-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/activejob-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/activejob-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/activejob-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/activejob-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/activejob-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/activeldap-5.2.4
-2206272223 metadata/md5-cache/dev-ruby/activeldap-6.0.4
-2206272223 metadata/md5-cache/dev-ruby/activeldap-6.1.0
-2206272223 metadata/md5-cache/dev-ruby/activemodel-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/activemodel-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/activemodel-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/activemodel-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
-2206272223 metadata/md5-cache/dev-ruby/activerecord-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/activestorage-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/activestorage-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/activestorage-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/activestorage-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/activesupport-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/activesupport-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/activesupport-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/activesupport-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
-2206282010 metadata/md5-cache/dev-ruby/addressable-2.8.0
-2206272223 metadata/md5-cache/dev-ruby/ae-1.8.2-r1
-2206272223 metadata/md5-cache/dev-ruby/afm-0.2.2-r1
-2206272223 metadata/md5-cache/dev-ruby/airbrussh-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/allison-2.0.3-r4
-2206272223 metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/amatch-0.4.1
-2206272223 metadata/md5-cache/dev-ruby/ammeter-1.1.5
-2206272223 metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
-2206272223 metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
-2206272223 metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
-2206272223 metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
-2206272223 metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
-2206272223 metadata/md5-cache/dev-ruby/arel-9.0.0
-2206272223 metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
-2206272223 metadata/md5-cache/dev-ruby/ascii85-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
-2206272223 metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
-2206272223 metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
-2206272223 metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
-2206272223 metadata/md5-cache/dev-ruby/asciimath-1.0.9
-2206272223 metadata/md5-cache/dev-ruby/asciimath-2.0.3
-2206272223 metadata/md5-cache/dev-ruby/asciimath-2.0.4
-2206272223 metadata/md5-cache/dev-ruby/ast-2.4.2
-2206272223 metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
-2206272223 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
-2206272223 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0
-2206272223 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
-2206272223 metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
-2206272223 metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
-2206272223 metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
-2206272223 metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
-2206272223 metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
-2206272223 metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
-2206272223 metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
-2206272223 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
-2206272223 metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
-2206272223 metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
-2206272223 metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0
-2206272223 metadata/md5-cache/dev-ruby/backports-3.20.2-r1
-2206272223 metadata/md5-cache/dev-ruby/backports-3.21.0
-2206272223 metadata/md5-cache/dev-ruby/backports-3.23.0
-2206272223 metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
-2206272223 metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
-2206272223 metadata/md5-cache/dev-ruby/barby-0.6.8
-2206272223 metadata/md5-cache/dev-ruby/base32-0.3.4
-2206272223 metadata/md5-cache/dev-ruby/base32-0.3.4-r1
-2206272223 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
-2206272223 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
-2206272223 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
-2206272223 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
-2206272223 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
-2206272223 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
-2206272223 metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
-2206272223 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
-2206272223 metadata/md5-cache/dev-ruby/bindata-2.4.10
-2206272223 metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
-2206272223 metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/bit-struct-0.17
-2206272223 metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
-2206272223 metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
-2206272223 metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
-2206272223 metadata/md5-cache/dev-ruby/bogus-0.1.6
-2206272223 metadata/md5-cache/dev-ruby/brass-1.2.1-r1
-2206272223 metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
-2206272223 metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
-2206272223 metadata/md5-cache/dev-ruby/bson-4.12.0
-2206272223 metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
-2206272223 metadata/md5-cache/dev-ruby/buftok-0.3.0
-2206272223 metadata/md5-cache/dev-ruby/builder-3.2.4
-2206272223 metadata/md5-cache/dev-ruby/builder-3.2.4-r1
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.1.4
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.18
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.24
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.25
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.29
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.31
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.2.33
-2206272223 metadata/md5-cache/dev-ruby/bundler-2.3.8
-2206272223 metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
-2206272223 metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
-2206272223 metadata/md5-cache/dev-ruby/bunny-2.17.0
-2206272223 metadata/md5-cache/dev-ruby/bunny-2.19.0
-2206272223 metadata/md5-cache/dev-ruby/c21e-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
-2206272223 metadata/md5-cache/dev-ruby/capistrano-3.16.0
-2206272223 metadata/md5-cache/dev-ruby/capistrano-3.17.0
-2206272223 metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
-2206272223 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
-2206282010 metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
-2206272223 metadata/md5-cache/dev-ruby/childprocess-4.1.0
-2206272223 metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
-2206272223 metadata/md5-cache/dev-ruby/chunky_png-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/cinch-2.3.4
-2206272223 metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/climate_control-0.2.0
-2206272223 metadata/md5-cache/dev-ruby/climate_control-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
-2206272223 metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
-2206272223 metadata/md5-cache/dev-ruby/coderay-1.1.2
-2206272223 metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
-2206272223 metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
-2206272223 metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
-2206272223 metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
-2206272223 metadata/md5-cache/dev-ruby/color-1.8-r1
-2206272223 metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/colored-1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/colored2-3.1.2
-2206272223 metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
-2206272223 metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
-2206272223 metadata/md5-cache/dev-ruby/combustion-1.3.6
-2206272223 metadata/md5-cache/dev-ruby/combustion-1.3.7
-2206272223 metadata/md5-cache/dev-ruby/commander-4.6.0
-2206272223 metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
-2206272223 metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
-2206272223 metadata/md5-cache/dev-ruby/connection_pool-2.2.5
-2206272223 metadata/md5-cache/dev-ruby/contracts-0.16.1
-2206272223 metadata/md5-cache/dev-ruby/contracts-0.17
-2206272223 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
-2206272223 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
-2206282010 metadata/md5-cache/dev-ruby/crack-0.4.4
-2206272223 metadata/md5-cache/dev-ruby/crass-1.0.6
-2206272223 metadata/md5-cache/dev-ruby/crass-1.0.6-r1
-2206272223 metadata/md5-cache/dev-ruby/creole-0.5.0-r1
-2206272223 metadata/md5-cache/dev-ruby/cri-2.15.11
-2206272223 metadata/md5-cache/dev-ruby/cri-2.15.11-r1
-2206272223 metadata/md5-cache/dev-ruby/css_parser-1.10.0
-2206272223 metadata/md5-cache/dev-ruby/css_parser-1.11.0
-2206272223 metadata/md5-cache/dev-ruby/css_parser-1.9.0
-2206272223 metadata/md5-cache/dev-ruby/csv-3.2.2
-2206272223 metadata/md5-cache/dev-ruby/csv-3.2.3
-2206272223 metadata/md5-cache/dev-ruby/curb-0.9.11-r1
-2206272223 metadata/md5-cache/dev-ruby/curb-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/curses-1.4.2
-2206272223 metadata/md5-cache/dev-ruby/curses-1.4.3
-2206272223 metadata/md5-cache/dev-ruby/curses-1.4.4
-2206272223 metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
-2206272223 metadata/md5-cache/dev-ruby/daemons-1.3.1
-2206272223 metadata/md5-cache/dev-ruby/daemons-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/daemons-1.4.1
-2206272223 metadata/md5-cache/dev-ruby/dalli-2.7.11
-2206272223 metadata/md5-cache/dev-ruby/dalli-3.0.3
-2206272223 metadata/md5-cache/dev-ruby/dalli-3.2.1
-2206272223 metadata/md5-cache/dev-ruby/dalli-3.2.2
-2206272223 metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/date-3.2.2
-2206272223 metadata/md5-cache/dev-ruby/date_validator-0.11.0
-2206272223 metadata/md5-cache/dev-ruby/date_validator-0.12.0
-2206272223 metadata/md5-cache/dev-ruby/dbf-4.1.3
-2206272223 metadata/md5-cache/dev-ruby/dbf-4.1.6
-2206272223 metadata/md5-cache/dev-ruby/dbf-4.2.0
-2206272223 metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/ddplugin-1.0.3
-2206272223 metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/deep_merge-1.2.1
-2206272223 metadata/md5-cache/dev-ruby/deep_merge-1.2.2
-2206272223 metadata/md5-cache/dev-ruby/delayer-1.2.1
-2206272223 metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
-2206272223 metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
-2206272223 metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
-2206272223 metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
-2206272223 metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
-2206272223 metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
-2206272223 metadata/md5-cache/dev-ruby/digest-3.1.0
-2206272223 metadata/md5-cache/dev-ruby/digest-3.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/diva-1.0.2-r2
-2206272223 metadata/md5-cache/dev-ruby/diva-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/diva-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/dnsruby-1.61.9
-2206272223 metadata/md5-cache/dev-ruby/docile-1.3.5
-2206272223 metadata/md5-cache/dev-ruby/docile-1.4.0
-2206282010 metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
-2206272223 metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
-2206272223 metadata/md5-cache/dev-ruby/dotenv-2.7.6
-2206272223 metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
-2206272223 metadata/md5-cache/dev-ruby/dust-0.1.7-r3
-2206272223 metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
-2206272223 metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
-2206272223 metadata/md5-cache/dev-ruby/ed25519-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
-2206272223 metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
-2206272223 metadata/md5-cache/dev-ruby/em-websocket-0.5.2
-2206272223 metadata/md5-cache/dev-ruby/em-websocket-0.5.3
-2206272223 metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
-2206272223 metadata/md5-cache/dev-ruby/equatable-0.7.0
-2206272223 metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
-2206272223 metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
-2206272223 metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
-2206272223 metadata/md5-cache/dev-ruby/ethon-0.14.0
-2206272223 metadata/md5-cache/dev-ruby/ethon-0.15.0
-2206272223 metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
-2206272223 metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
-2206272223 metadata/md5-cache/dev-ruby/excon-0.92.3
-2206272223 metadata/md5-cache/dev-ruby/execjs-2.8.1
-2206272223 metadata/md5-cache/dev-ruby/exifr-1.3.8
-2206272223 metadata/md5-cache/dev-ruby/exifr-1.3.9
-2206281115 metadata/md5-cache/dev-ruby/facter-3.14.23
-2206272223 metadata/md5-cache/dev-ruby/fakefs-1.2.3
-2206272223 metadata/md5-cache/dev-ruby/fakefs-1.3.2
-2206272223 metadata/md5-cache/dev-ruby/faker-2.19.0
-2206272223 metadata/md5-cache/dev-ruby/faraday-0.17.3
-2206272223 metadata/md5-cache/dev-ruby/faraday-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/faraday-1.3.1
-2206272223 metadata/md5-cache/dev-ruby/faraday-2.3.0
-2206272223 metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
-2206272223 metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
-2206272223 metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
-2206272223 metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
-2206272223 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
-2206272223 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
-2206272223 metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
-2206272223 metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
-2206272223 metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
-2206272223 metadata/md5-cache/dev-ruby/fattr-2.4.0
-2206272223 metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
-2206272223 metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1
-2206272223 metadata/md5-cache/dev-ruby/ffaker-2.20.0
-2206272223 metadata/md5-cache/dev-ruby/ffaker-2.21.0
-2206272223 metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
-2206272223 metadata/md5-cache/dev-ruby/ffi-1.15.5
-2206272223 metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/filesize-0.2.0
-2206272223 metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/filigree-0.4.1
-2206272223 metadata/md5-cache/dev-ruby/fivemat-1.3.7
-2206272223 metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
-2206272223 metadata/md5-cache/dev-ruby/flickraw-0.9.10
-2206272223 metadata/md5-cache/dev-ruby/flog-4.6.4
-2206272223 metadata/md5-cache/dev-ruby/flog-4.6.5
-2206272223 metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
-2206272223 metadata/md5-cache/dev-ruby/forgery-0.8.1
-2206272223 metadata/md5-cache/dev-ruby/forwardable-1.3.2
-2206272223 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
-2206272223 metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
-2206272223 metadata/md5-cache/dev-ruby/fuubar-2.5.1
-2206272223 metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
-2206272223 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
-2206272223 metadata/md5-cache/dev-ruby/gh-0.18.0-r1
-2206272223 metadata/md5-cache/dev-ruby/gherkin-5.1.0
-2206272223 metadata/md5-cache/dev-ruby/gist-6.0.0
-2206272223 metadata/md5-cache/dev-ruby/git-1.10.2
-2206272223 metadata/md5-cache/dev-ruby/git-1.11.0
-2206272223 metadata/md5-cache/dev-ruby/globalid-0.6.0
-2206272223 metadata/md5-cache/dev-ruby/globalid-1.0.0
-2206272223 metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
-2206272223 metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
-2206272223 metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
-2206281115 metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
-2206272223 metadata/md5-cache/dev-ruby/gruff-0.14.0
-2206272223 metadata/md5-cache/dev-ruby/gruff-0.15.0
-2206272223 metadata/md5-cache/dev-ruby/gruff-0.16.0
-2206272223 metadata/md5-cache/dev-ruby/gruff-0.17.0
-2206272223 metadata/md5-cache/dev-ruby/gruff-0.18.0
-2206272223 metadata/md5-cache/dev-ruby/haml-5.2.2
-2206272223 metadata/md5-cache/dev-ruby/haml-rails-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
-2206282010 metadata/md5-cache/dev-ruby/hashdiff-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
-2206272223 metadata/md5-cache/dev-ruby/hashie-3.6.0
-2206272223 metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/hashie-5.0.0
-2206272223 metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/hiera-3.8.0
-2206272223 metadata/md5-cache/dev-ruby/hiera-3.9.0
-2206272223 metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
-2206272223 metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
-2206272223 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
-2206272223 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
-2206272223 metadata/md5-cache/dev-ruby/highline-2.0.3
-2206272223 metadata/md5-cache/dev-ruby/highline-2.0.3-r1
-2206272223 metadata/md5-cache/dev-ruby/hipchat-1.6.0
-2206272223 metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
-2206272223 metadata/md5-cache/dev-ruby/histogram-0.2.4.1
-2206272223 metadata/md5-cache/dev-ruby/hitimes-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/hocon-1.3.1
-2206272223 metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
-2206272223 metadata/md5-cache/dev-ruby/hoe-3.21.0
-2206272223 metadata/md5-cache/dev-ruby/hoe-3.23.1
-2206272223 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
-2206272223 metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
-2206272223 metadata/md5-cache/dev-ruby/http-4.1.1
-2206272223 metadata/md5-cache/dev-ruby/http-4.4.1
-2206272223 metadata/md5-cache/dev-ruby/http-accept-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
-2206282010 metadata/md5-cache/dev-ruby/http-cookie-1.0.4
-2206272223 metadata/md5-cache/dev-ruby/http-cookie-1.0.5
-2206272223 metadata/md5-cache/dev-ruby/http-form_data-2.3.0
-2206272223 metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
-2206272223 metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
-2206272223 metadata/md5-cache/dev-ruby/httparty-0.20.0
-2206272223 metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
-2206282010 metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
-2206272223 metadata/md5-cache/dev-ruby/i18n-1.10.0
-2206272223 metadata/md5-cache/dev-ruby/i18n-1.8.10
-2206272223 metadata/md5-cache/dev-ruby/i18n-1.8.11
-2206272223 metadata/md5-cache/dev-ruby/i18n-1.8.9
-2206272223 metadata/md5-cache/dev-ruby/i18n-1.9.1
-2206272223 metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
-2206272223 metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
-2206272223 metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
-2206272223 metadata/md5-cache/dev-ruby/image_processing-1.12.2
-2206272223 metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
-2206272223 metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/instance_storage-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
-2206272223 metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
-2206272223 metadata/md5-cache/dev-ruby/io-wait-0.2.1
-2206272223 metadata/md5-cache/dev-ruby/io-wait-0.2.3
-2206272223 metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
-2206272223 metadata/md5-cache/dev-ruby/itextomml-1.6.1
-2206272223 metadata/md5-cache/dev-ruby/jbuilder-2.10.1
-2206272223 metadata/md5-cache/dev-ruby/jbuilder-2.11.2
-2206272223 metadata/md5-cache/dev-ruby/jbuilder-2.11.5
-2206272223 metadata/md5-cache/dev-ruby/jmespath-1.6.1
-2206272223 metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
-2206272223 metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
-2206272223 metadata/md5-cache/dev-ruby/jsobfu-0.4.2
-2206272223 metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/json-2.5.1-r1
-2206272223 metadata/md5-cache/dev-ruby/json-2.6.1
-2206272223 metadata/md5-cache/dev-ruby/json-2.6.2
-2206272223 metadata/md5-cache/dev-ruby/json_schema-0.20.9
-2206272223 metadata/md5-cache/dev-ruby/jwt-2.2.3
-2206272223 metadata/md5-cache/dev-ruby/jwt-2.3.0
-2206272223 metadata/md5-cache/dev-ruby/jwt-2.4.0
-2206272223 metadata/md5-cache/dev-ruby/jwt-2.4.1
-2206272223 metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
-2206272223 metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/kpeg-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/kpeg-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/kpeg-1.3.1
-2206272223 metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
-2206272223 metadata/md5-cache/dev-ruby/kramdown-2.3.2
-2206272223 metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/launchy-2.5.0
-2206272223 metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
-2206272223 metadata/md5-cache/dev-ruby/letter_opener-1.8.0
-2206272223 metadata/md5-cache/dev-ruby/letter_opener-1.8.1
-2206272223 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
-2206272223 metadata/md5-cache/dev-ruby/libusb-0.6.4
-2206272223 metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
-2206272223 metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
-2206272223 metadata/md5-cache/dev-ruby/liquid-5.0.1
-2206272223 metadata/md5-cache/dev-ruby/liquid-5.1.0
-2206272223 metadata/md5-cache/dev-ruby/liquid-5.2.0
-2206272223 metadata/md5-cache/dev-ruby/liquid-5.3.0
-2206272223 metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/liquid-c-4.1.0
-2206272223 metadata/md5-cache/dev-ruby/listen-3.5.1
-2206272223 metadata/md5-cache/dev-ruby/listen-3.6.0
-2206272223 metadata/md5-cache/dev-ruby/listen-3.7.0
-2206272223 metadata/md5-cache/dev-ruby/listen-3.7.1
-2206272223 metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
-2206272223 metadata/md5-cache/dev-ruby/locale-2.1.3
-2206272223 metadata/md5-cache/dev-ruby/localhost-1.1.9
-2206272223 metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
-2206272223 metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
-2206272223 metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
-2206272223 metadata/md5-cache/dev-ruby/logue-1.0.18
-2206272223 metadata/md5-cache/dev-ruby/loofah-2.12.0
-2206272223 metadata/md5-cache/dev-ruby/loofah-2.14.0
-2206272223 metadata/md5-cache/dev-ruby/loofah-2.15.0
-2206272223 metadata/md5-cache/dev-ruby/loofah-2.18.0
-2206272223 metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
-2206272223 metadata/md5-cache/dev-ruby/lumberjack-1.2.7
-2206272223 metadata/md5-cache/dev-ruby/lumberjack-1.2.8
-2206272223 metadata/md5-cache/dev-ruby/mab-0.0.3-r2
-2206272223 metadata/md5-cache/dev-ruby/magic-0.2.9-r1
-2206272223 metadata/md5-cache/dev-ruby/magic-0.2.9-r2
-2206272223 metadata/md5-cache/dev-ruby/mail-2.7.1-r1
-2206272223 metadata/md5-cache/dev-ruby/maildir-2.2.3
-2206272223 metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
-2206272223 metadata/md5-cache/dev-ruby/marcel-1.0.2
-2206272223 metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
-2206272223 metadata/md5-cache/dev-ruby/mash-0.1.1-r3
-2206272223 metadata/md5-cache/dev-ruby/matrix-0.4.2
-2206272223 metadata/md5-cache/dev-ruby/maxitest-3.7.0
-2206272223 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
-2206272223 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
-2206272223 metadata/md5-cache/dev-ruby/mechanize-2.8.4
-2206272223 metadata/md5-cache/dev-ruby/mechanize-2.8.5
-2206272223 metadata/md5-cache/dev-ruby/memo_wise-1.6.0
-2206272223 metadata/md5-cache/dev-ruby/memo_wise-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/memoist-0.16.2
-2206272223 metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
-2206272223 metadata/md5-cache/dev-ruby/mercenary-0.4.0
-2206272223 metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
-2206272223 metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
-2206272223 metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
-2206272223 metadata/md5-cache/dev-ruby/method_source-1.0.0
-2206272223 metadata/md5-cache/dev-ruby/middleware-0.1.0
-2206272223 metadata/md5-cache/dev-ruby/mime-types-2.99.3
-2206272223 metadata/md5-cache/dev-ruby/mime-types-3.3.1
-2206272223 metadata/md5-cache/dev-ruby/mime-types-3.4.1
-2206272223 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
-2206272223 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115
-2206272223 metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
-2206272223 metadata/md5-cache/dev-ruby/mimemagic-0.3.10
-2206272223 metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
-2206272223 metadata/md5-cache/dev-ruby/mimemagic-0.4.3
-2206272223 metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
-2206272223 metadata/md5-cache/dev-ruby/mini_magick-4.11.0
-2206272223 metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
-2206272223 metadata/md5-cache/dev-ruby/mini_mime-1.0.3
-2206272223 metadata/md5-cache/dev-ruby/mini_mime-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/mini_mime-1.1.2
-2206272223 metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
-2206272223 metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
-2206272223 metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
-2206272223 metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
-2206272223 metadata/md5-cache/dev-ruby/minitar-0.9
-2206272223 metadata/md5-cache/dev-ruby/minitar-0.9-r1
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.13.0
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.14.3
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.14.4
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.15.0
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.16.0
-2206272223 metadata/md5-cache/dev-ruby/minitest-5.16.1
-2206272223 metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
-2206272223 metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
-2206272223 metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
-2206272223 metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
-2206272223 metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
-2206272223 metadata/md5-cache/dev-ruby/mocha-1.13.0
-2206272223 metadata/md5-cache/dev-ruby/mocha-1.14.0
-2206272223 metadata/md5-cache/dev-ruby/moneta-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/moneta-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/moneta-1.4.1
-2206272223 metadata/md5-cache/dev-ruby/moneta-1.5.1
-2206272223 metadata/md5-cache/dev-ruby/mqtt-0.5.0
-2206272223 metadata/md5-cache/dev-ruby/msgpack-1.4.5
-2206272223 metadata/md5-cache/dev-ruby/msgpack-1.5.1
-2206272223 metadata/md5-cache/dev-ruby/msgpack-1.5.2
-2206272223 metadata/md5-cache/dev-ruby/multi_json-1.14.1
-2206272223 metadata/md5-cache/dev-ruby/multi_json-1.15.0
-2206272223 metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/multi_test-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
-2206272223 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
-2206272223 metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
-2206272223 metadata/md5-cache/dev-ruby/multipart-post-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/multipart-post-2.2.2
-2206272223 metadata/md5-cache/dev-ruby/multipart-post-2.2.3
-2206272223 metadata/md5-cache/dev-ruby/mustache-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
-2206272223 metadata/md5-cache/dev-ruby/mustermann-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
-2206272223 metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
-2206272223 metadata/md5-cache/dev-ruby/mysql2-0.5.4
-2206272223 metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2
-2206272223 metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
-2206272223 metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
-2206272223 metadata/md5-cache/dev-ruby/naught-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/necromancer-0.5.1
-2206272223 metadata/md5-cache/dev-ruby/necromancer-0.7.0
-2206272223 metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
-2206272223 metadata/md5-cache/dev-ruby/net-ftp-0.1.3
-2206272223 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
-2206272223 metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
-2206272223 metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
-2206272223 metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/net-imap-0.2.3
-2206272223 metadata/md5-cache/dev-ruby/net-pop-0.1.1
-2206272223 metadata/md5-cache/dev-ruby/net-protocol-0.1.2
-2206272223 metadata/md5-cache/dev-ruby/net-protocol-0.1.3
-2206272223 metadata/md5-cache/dev-ruby/net-scp-3.0.0
-2206272223 metadata/md5-cache/dev-ruby/net-sftp-3.0.0
-2206272223 metadata/md5-cache/dev-ruby/net-smtp-0.3.1
-2206272223 metadata/md5-cache/dev-ruby/net-ssh-5.2.0
-2206272223 metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
-2206272223 metadata/md5-cache/dev-ruby/net-ssh-7.0.1
-2206272223 metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/net-telnet-0.2.0
-2206272223 metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
-2206272223 metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/nio4r-2.5.4
-2206272223 metadata/md5-cache/dev-ruby/nio4r-2.5.8
-2206272223 metadata/md5-cache/dev-ruby/nokogiri-1.13.6
-2206272223 metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
-2206272223 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
-2206272223 metadata/md5-cache/dev-ruby/oauth-0.5.10
-2206272223 metadata/md5-cache/dev-ruby/oauth-0.5.8
-2206272223 metadata/md5-cache/dev-ruby/oauth2-1.4.7
-2206272223 metadata/md5-cache/dev-ruby/octokit-4.22.0
-2206272223 metadata/md5-cache/dev-ruby/octokit-4.23.0
-2206272223 metadata/md5-cache/dev-ruby/octokit-4.24.0
-2206272223 metadata/md5-cache/dev-ruby/octokit-4.25.0
-2206272223 metadata/md5-cache/dev-ruby/omniauth-2.0.4
-2206272223 metadata/md5-cache/dev-ruby/omniauth-2.1.0
-2206272223 metadata/md5-cache/dev-ruby/open4-1.3.4-r1
-2206272223 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
-2206272223 metadata/md5-cache/dev-ruby/optimist-3.0.1
-2206272223 metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
-2206272223 metadata/md5-cache/dev-ruby/origin-2.3.1
-2206272223 metadata/md5-cache/dev-ruby/ox-2.14.10
-2206272223 metadata/md5-cache/dev-ruby/ox-2.14.11
-2206272223 metadata/md5-cache/dev-ruby/ox-2.14.8
-2206272223 metadata/md5-cache/dev-ruby/ox-2.14.9
-2206272223 metadata/md5-cache/dev-ruby/packetfu-1.1.13
-2206272223 metadata/md5-cache/dev-ruby/paint-2.2.1
-2206272223 metadata/md5-cache/dev-ruby/parallel-1.22.1
-2206272223 metadata/md5-cache/dev-ruby/paramesan-0.1.1
-2206272223 metadata/md5-cache/dev-ruby/paramesan-1.0.1
-2206272223 metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/parser-3.0.3.2
-2206272223 metadata/md5-cache/dev-ruby/parser-3.1.0.0
-2206272223 metadata/md5-cache/dev-ruby/parser-3.1.1.0
-2206272223 metadata/md5-cache/dev-ruby/parser-3.1.2.0
-2206272223 metadata/md5-cache/dev-ruby/pastel-0.8.0
-2206272223 metadata/md5-cache/dev-ruby/path_expander-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/pathutil-0.16.2
-2206272223 metadata/md5-cache/dev-ruby/patron-0.13.3-r1
-2206272223 metadata/md5-cache/dev-ruby/pcaprub-0.13.1
-2206272223 metadata/md5-cache/dev-ruby/pdf-core-0.9.0
-2206272223 metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
-2206272223 metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
-2206272223 metadata/md5-cache/dev-ruby/pdf-reader-2.8.0
-2206272223 metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
-2206272223 metadata/md5-cache/dev-ruby/pdf-reader-2.9.1
-2206272223 metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
-2206272223 metadata/md5-cache/dev-ruby/pg-1.2.2
-2206272223 metadata/md5-cache/dev-ruby/pg-1.2.3
-2206272223 metadata/md5-cache/dev-ruby/pg-1.3.5
-2206272223 metadata/md5-cache/dev-ruby/pg-1.4.1
-2206272223 metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
-2206272223 metadata/md5-cache/dev-ruby/pkg-config-1.4.1
-2206272223 metadata/md5-cache/dev-ruby/pkg-config-1.4.6
-2206272223 metadata/md5-cache/dev-ruby/pkg-config-1.4.7
-2206272223 metadata/md5-cache/dev-ruby/plist-3.6.0
-2206272223 metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
-2206272223 metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
-2206272223 metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
-2206272223 metadata/md5-cache/dev-ruby/power_assert-1.1.7
-2206272223 metadata/md5-cache/dev-ruby/power_assert-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/power_assert-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/power_assert-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/prawn-2.4.0
-2206272223 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
-2206272223 metadata/md5-cache/dev-ruby/prime-0.1.2
-2206272223 metadata/md5-cache/dev-ruby/prime-0.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/propshaft-0.6.1
-2206272223 metadata/md5-cache/dev-ruby/propshaft-0.6.4
-2206272223 metadata/md5-cache/dev-ruby/pry-0.14.1
-2206272223 metadata/md5-cache/dev-ruby/psych-4.0.3
-2206272223 metadata/md5-cache/dev-ruby/psych-4.0.4
-2206272223 metadata/md5-cache/dev-ruby/public_suffix-3.1.1
-2206282010 metadata/md5-cache/dev-ruby/public_suffix-4.0.6
-2206272223 metadata/md5-cache/dev-ruby/public_suffix-4.0.7
-2206272223 metadata/md5-cache/dev-ruby/pundit-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
-2206272223 metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
 2206272223 metadata/md5-cache/dev-ruby/puppetdb-termini-7.10.1
-2206272223 metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
-2206272223 metadata/md5-cache/dev-ruby/qed-2.9.2-r1
-2206272223 metadata/md5-cache/dev-ruby/racc-1.4.16-r1
-2206272223 metadata/md5-cache/dev-ruby/racc-1.5.2
-2206272223 metadata/md5-cache/dev-ruby/racc-1.5.2-r1
-2206272223 metadata/md5-cache/dev-ruby/racc-1.5.2-r2
-2206272223 metadata/md5-cache/dev-ruby/racc-1.6.0
-2206272223 metadata/md5-cache/dev-ruby/rack-2.2.3
-2206272223 metadata/md5-cache/dev-ruby/rack-2.2.3.1
-2206272223 metadata/md5-cache/dev-ruby/rack-attack-6.6.0
-2206272223 metadata/md5-cache/dev-ruby/rack-attack-6.6.1
-2206272223 metadata/md5-cache/dev-ruby/rack-cache-1.13.0
-2206272223 metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/rack-protection-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/rack-test-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/radius-0.7.5-r1
-2206272223 metadata/md5-cache/dev-ruby/rails-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/rails-6.0.5
-2206272223 metadata/md5-cache/dev-ruby/rails-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/rails-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/rails-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/rails-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
-2206272223 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
-2206272223 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
-2206272223 metadata/md5-cache/dev-ruby/railties-5.2.8
-2206272223 metadata/md5-cache/dev-ruby/railties-6.1.5.1
-2206272223 metadata/md5-cache/dev-ruby/railties-6.1.6
-2206272223 metadata/md5-cache/dev-ruby/railties-7.0.2.4
-2206272223 metadata/md5-cache/dev-ruby/railties-7.0.3
-2206272223 metadata/md5-cache/dev-ruby/rainbow-3.0.0
-2206272223 metadata/md5-cache/dev-ruby/rainbow-3.1.1
-2206272223 metadata/md5-cache/dev-ruby/rake-13.0.3-r1
-2206272223 metadata/md5-cache/dev-ruby/rake-13.0.4
-2206272223 metadata/md5-cache/dev-ruby/rake-13.0.6
-2206272223 metadata/md5-cache/dev-ruby/rake-13.0.6-r1
-2206272223 metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
-2206272223 metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
-2206272223 metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
-2206272223 metadata/md5-cache/dev-ruby/rantly-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/rash_alt-0.4.12
-2206272223 metadata/md5-cache/dev-ruby/rash_alt-0.4.9
-2206272223 metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
-2206272223 metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
-2206272223 metadata/md5-cache/dev-ruby/rbnacl-7.1.1
-2206272223 metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
-2206272223 metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
-2206272223 metadata/md5-cache/dev-ruby/rbs-1.3.3
-2206272223 metadata/md5-cache/dev-ruby/rbs-1.5.1
-2206272223 metadata/md5-cache/dev-ruby/rbs-2.3.1
-2206272223 metadata/md5-cache/dev-ruby/rbs-2.3.2
-2206272223 metadata/md5-cache/dev-ruby/rbs-2.5.0
-2206272223 metadata/md5-cache/dev-ruby/rbs-2.5.1
-2206272223 metadata/md5-cache/dev-ruby/rbtree-0.4.5
-2206272223 metadata/md5-cache/dev-ruby/rcairo-1.16.6
-2206272223 metadata/md5-cache/dev-ruby/rcairo-1.17.5
-2206272223 metadata/md5-cache/dev-ruby/rchardet-1.8.0
-2206272223 metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
-2206272223 metadata/md5-cache/dev-ruby/rdoc-6.3.2
-2206272223 metadata/md5-cache/dev-ruby/rdoc-6.3.3
-2206272223 metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
-2206272223 metadata/md5-cache/dev-ruby/rdoc-6.4.0
-2206272223 metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
-2206272223 metadata/md5-cache/dev-ruby/recog-2.3.19
-2206272223 metadata/md5-cache/dev-ruby/recog-2.3.20
-2206272223 metadata/md5-cache/dev-ruby/recog-2.3.23
-2206272223 metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/redcarpet-3.5.1
-2206272223 metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
-2206272223 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
-2206272223 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
-2206272223 metadata/md5-cache/dev-ruby/redis-4.1.4
-2206272223 metadata/md5-cache/dev-ruby/ref-2.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
-2206272223 metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
-2206272223 metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
-2206272223 metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/request_store-1.5.0
-2206272223 metadata/md5-cache/dev-ruby/request_store-1.5.1
-2206272223 metadata/md5-cache/dev-ruby/rest-client-2.1.0
-2206272223 metadata/md5-cache/dev-ruby/rexical-1.0.7
-2206272223 metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
-2206272223 metadata/md5-cache/dev-ruby/rexml-3.2.5
-2206272223 metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
-2206272223 metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
-2206272223 metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
-2206272223 metadata/md5-cache/dev-ruby/rmagick-4.2.2
-2206272223 metadata/md5-cache/dev-ruby/rmagick-4.2.3
-2206272223 metadata/md5-cache/dev-ruby/rmagick-4.2.4
-2206272223 metadata/md5-cache/dev-ruby/rmagick-4.2.5
-2206272223 metadata/md5-cache/dev-ruby/roadie-4.0.0
-2206272223 metadata/md5-cache/dev-ruby/roadie-5.0.0
-2206272223 metadata/md5-cache/dev-ruby/roadie-5.0.1
-2206272223 metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
-2206272223 metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/robots-0.10.1-r3
-2206272223 metadata/md5-cache/dev-ruby/rotp-6.2.0
-2206272223 metadata/md5-cache/dev-ruby/rouge-3.26.0
-2206272223 metadata/md5-cache/dev-ruby/rouge-3.26.1
-2206272223 metadata/md5-cache/dev-ruby/rouge-3.27.0
-2206272223 metadata/md5-cache/dev-ruby/rouge-3.28.0
-2206272223 metadata/md5-cache/dev-ruby/rouge-3.29.0
-2206272223 metadata/md5-cache/dev-ruby/rqrcode-2.1.0
-2206272223 metadata/md5-cache/dev-ruby/rqrcode-2.1.1
-2206272223 metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/rr-1.2.1
-2206272223 metadata/md5-cache/dev-ruby/rr-3.0.9
-2206272223 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-2.99.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-3.10.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-3.11.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
-2206272223 metadata/md5-cache/dev-ruby/rspec-core-3.10.1
-2206272223 metadata/md5-cache/dev-ruby/rspec-core-3.10.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-core-3.11.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
-2206272223 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
-2206282010 metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
-2206272223 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
-2206272223 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
-2206272223 metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
-2206272223 metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-rails-5.1.1
-2206272223 metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
-2206272223 metadata/md5-cache/dev-ruby/rspec-support-3.10.2
-2206272223 metadata/md5-cache/dev-ruby/rspec-support-3.10.3
-2206272223 metadata/md5-cache/dev-ruby/rspec-support-3.11.0
-2206272223 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
-2206272223 metadata/md5-cache/dev-ruby/rss-0.2.9
-2206272223 metadata/md5-cache/dev-ruby/rss-0.2.9-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
-2206272223 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
-2206272223 metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
-2206272223 metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
-2206272223 metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
-2206272223 metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
-2206272223 metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
-2206272223 metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
-2206272223 metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
-2206272223 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
-2206272223 metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
-2206272223 metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
-2206272223 metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
-2206272223 metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
-2206272223 metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
-2206272223 metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
-2206272223 metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
-2206272223 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
-2206272223 metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
-2206272223 metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
-2206272223 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
-2206272223 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
-2206272223 metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
-2206272223 metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
-2206272223 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
-2206272223 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
-2206272223 metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
-2206272223 metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
-2206272223 metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.0.3
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.0.9
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.1.6
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.2.14
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.2.22
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.2.33
-2206272223 metadata/md5-cache/dev-ruby/rubygems-3.3.8
-2206272223 metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
-2206272223 metadata/md5-cache/dev-ruby/rubypants-0.7.1
-2206272223 metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
-2206272223 metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
-2206272223 metadata/md5-cache/dev-ruby/rubyzip-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
-2206272223 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
-2206272223 metadata/md5-cache/dev-ruby/sanitize-6.0.0
-2206272223 metadata/md5-cache/dev-ruby/sass-3.5.7
-2206272223 metadata/md5-cache/dev-ruby/sass-3.5.7-r1
-2206282010 metadata/md5-cache/dev-ruby/sass-3.7.4
-2206272223 metadata/md5-cache/dev-ruby/sass-3.7.4-r1
-2206282010 metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/sass-rails-5.0.8
-2206272223 metadata/md5-cache/dev-ruby/sass-rails-5.1.0
-2206272223 metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
-2206272223 metadata/md5-cache/dev-ruby/sawyer-0.9.1
-2206272223 metadata/md5-cache/dev-ruby/sdoc-1.1.0
-2206272223 metadata/md5-cache/dev-ruby/seed-fu-2.3.9
-2206272223 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
-2206272223 metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
-2206272223 metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
-2206272223 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
-2206272223 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
-2206272223 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
-2206272223 metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/serialport-1.3.2
-2206272223 metadata/md5-cache/dev-ruby/serverengine-2.2.5
-2206272223 metadata/md5-cache/dev-ruby/serverengine-2.3.0
-2206272223 metadata/md5-cache/dev-ruby/set-1.0.2
-2206272223 metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
-2206272223 metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
-2206272223 metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
-2206272223 metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
-2206282010 metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
-2206272223 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
-2206272223 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
-2206272223 metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
-2206272223 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
-2206272223 metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
-2206272223 metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
-2206272223 metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
-2206272223 metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
-2206272223 metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
-2206272223 metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
-2206272223 metadata/md5-cache/dev-ruby/simple-rss-1.3.3
-2206272223 metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
-2206272223 metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
-2206272223 metadata/md5-cache/dev-ruby/simplecov-0.19.1
-2206272223 metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
-2206272223 metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
-2206272223 metadata/md5-cache/dev-ruby/sinatra-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
-2206272223 metadata/md5-cache/dev-ruby/singleton-0.1.1
-2206272223 metadata/md5-cache/dev-ruby/six-0.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/slim-3.0.9-r1
-2206272223 metadata/md5-cache/dev-ruby/slim-4.1.0
-2206272223 metadata/md5-cache/dev-ruby/slim-4.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/slim-4.1.0-r2
-2206272223 metadata/md5-cache/dev-ruby/slop-4.9.2
-2206272223 metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/sorted_set-1.0.3
-2206272223 metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
-2206272223 metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
-2206272223 metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
-2206272223 metadata/md5-cache/dev-ruby/spring-3.1.1
-2206272223 metadata/md5-cache/dev-ruby/spring-4.0.0
-2206272223 metadata/md5-cache/dev-ruby/sprockets-3.7.2
-2206272223 metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
-2206272223 metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
-2206272223 metadata/md5-cache/dev-ruby/sprockets-4.0.2
-2206272223 metadata/md5-cache/dev-ruby/sprockets-4.1.0
-2206272223 metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/spy-1.0.2
-2206272223 metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
-2206272223 metadata/md5-cache/dev-ruby/sqlite3-1.4.3
-2206272223 metadata/md5-cache/dev-ruby/sqlite3-1.4.4
-2206272223 metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/sshkit-1.21.2
-2206272223 metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
-2206272223 metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/stomp-1.4.10
-2206272223 metadata/md5-cache/dev-ruby/stomp-1.4.9
-2206272223 metadata/md5-cache/dev-ruby/stringio-3.0.1
-2206272223 metadata/md5-cache/dev-ruby/stringio-3.0.2
-2206272223 metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
-2206272223 metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
-2206272223 metadata/md5-cache/dev-ruby/strscan-3.0.1
-2206272223 metadata/md5-cache/dev-ruby/strscan-3.0.2
-2206272223 metadata/md5-cache/dev-ruby/strscan-3.0.3
-2206272223 metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
-2206272223 metadata/md5-cache/dev-ruby/sync-0.5.0
-2206272223 metadata/md5-cache/dev-ruby/syntax-1.2.2
-2206272223 metadata/md5-cache/dev-ruby/sys-uname-1.2.2
-2206272223 metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
-2206272223 metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
-2206272223 metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
-2206272223 metadata/md5-cache/dev-ruby/temple-0.8.2
-2206272223 metadata/md5-cache/dev-ruby/temple-0.8.2-r1
-2206272223 metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
-2206272223 metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
-2206272223 metadata/md5-cache/dev-ruby/terminal-table-2.0.0
-2206272223 metadata/md5-cache/dev-ruby/terminal-table-3.0.2
-2206272223 metadata/md5-cache/dev-ruby/test-unit-3.3.9
-2206272223 metadata/md5-cache/dev-ruby/test-unit-3.4.9
-2206272223 metadata/md5-cache/dev-ruby/test-unit-3.5.3
-2206272223 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
-2206272223 metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
-2206272223 metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
-2206272223 metadata/md5-cache/dev-ruby/text-1.3.1-r1
-2206272223 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
-2206272223 metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
-2206272223 metadata/md5-cache/dev-ruby/thor-1.1.0
-2206282010 metadata/md5-cache/dev-ruby/thor-1.2.1
-2206272223 metadata/md5-cache/dev-ruby/thread_order-1.1.1
-2206272223 metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
-2206272223 metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
-2206272223 metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
-2206272223 metadata/md5-cache/dev-ruby/tilt-2.0.10
-2206272223 metadata/md5-cache/dev-ruby/tilt-2.0.10-r1
-2206272223 metadata/md5-cache/dev-ruby/time-0.2.0
-2206272223 metadata/md5-cache/dev-ruby/timecop-0.9.4
-2206272223 metadata/md5-cache/dev-ruby/timecop-0.9.5
-2206272223 metadata/md5-cache/dev-ruby/timeout-0.2.0
-2206272223 metadata/md5-cache/dev-ruby/timeout-0.3.0
-2206272223 metadata/md5-cache/dev-ruby/timers-4.3.3
-2206272223 metadata/md5-cache/dev-ruby/tins-1.29.1
-2206272223 metadata/md5-cache/dev-ruby/tins-1.31.0
-2206272223 metadata/md5-cache/dev-ruby/tins-1.31.1
-2206272223 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
-2206272223 metadata/md5-cache/dev-ruby/tomlrb-1.2.8
-2206272223 metadata/md5-cache/dev-ruby/tomlrb-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/tomlrb-2.0.2
-2206272223 metadata/md5-cache/dev-ruby/tomlrb-2.0.3
-2206272223 metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
-2206272223 metadata/md5-cache/dev-ruby/travis-1.10.0-r1
-2206272223 metadata/md5-cache/dev-ruby/travis-1.11.0
-2206272223 metadata/md5-cache/dev-ruby/travis-1.11.1
-2206272223 metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
-2206272223 metadata/md5-cache/dev-ruby/trollop-2.9.10
-2206272223 metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
-2206272223 metadata/md5-cache/dev-ruby/ttfunk-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/tty-color-0.6.0
-2206272223 metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
-2206272223 metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
-2206272223 metadata/md5-cache/dev-ruby/tty-editor-0.7.0
-2206272223 metadata/md5-cache/dev-ruby/tty-file-0.10.0
-2206272223 metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
-2206272223 metadata/md5-cache/dev-ruby/tty-reader-0.9.0
-2206272223 metadata/md5-cache/dev-ruby/tty-screen-0.8.1
-2206272223 metadata/md5-cache/dev-ruby/tty-which-0.5.0
-2206272223 metadata/md5-cache/dev-ruby/turbolinks-5.2.1
-2206272223 metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
-2206272223 metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
-2206272223 metadata/md5-cache/dev-ruby/typeprof-0.15.2
-2206272223 metadata/md5-cache/dev-ruby/typeprof-0.21.2
-2206272223 metadata/md5-cache/dev-ruby/typhoeus-1.4.0
-2206272223 metadata/md5-cache/dev-ruby/tzinfo-1.2.9
-2206272223 metadata/md5-cache/dev-ruby/tzinfo-2.0.4
-2206272223 metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
-2206272223 metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
-2206282010 metadata/md5-cache/dev-ruby/unf-0.1.4-r1
-2206272223 metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
-2206282010 metadata/md5-cache/dev-ruby/unf_ext-0.0.8
-2206272223 metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
-2206272223 metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
-2206272223 metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
-2206272223 metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/unindent-1.0-r1
-2206272223 metadata/md5-cache/dev-ruby/uuidtools-2.2.0
-2206272223 metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
-2206272223 metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
-2206272223 metadata/md5-cache/dev-ruby/vcard-0.3.0
-2206272223 metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
-2206272223 metadata/md5-cache/dev-ruby/vcr-4.0.0
-2206272223 metadata/md5-cache/dev-ruby/vcr-5.1.0
-2206272223 metadata/md5-cache/dev-ruby/vcr-6.0.0
-2206272223 metadata/md5-cache/dev-ruby/vcr-6.1.0
-2206272223 metadata/md5-cache/dev-ruby/virtus-1.0.5
-2206272223 metadata/md5-cache/dev-ruby/vlad-2.7.1
-2206272223 metadata/md5-cache/dev-ruby/warden-1.2.9-r1
-2206272223 metadata/md5-cache/dev-ruby/web-console-3.7.0
-2206272223 metadata/md5-cache/dev-ruby/web-console-4.2.0
-2206282010 metadata/md5-cache/dev-ruby/webmock-3.14.0
-2206272223 metadata/md5-cache/dev-ruby/webrick-1.7.0
-2206272223 metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
-2206272223 metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
-2206272223 metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
-2206272223 metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
-2206272223 metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
-2206272223 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
-2206272223 metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
-2206272223 metadata/md5-cache/dev-ruby/will_paginate-3.3.1
-2206272223 metadata/md5-cache/dev-ruby/windows_error-0.1.3
-2206272223 metadata/md5-cache/dev-ruby/windows_error-0.1.4
-2206272223 metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
-2206272223 metadata/md5-cache/dev-ruby/wisper-2.0.1
-2206272223 metadata/md5-cache/dev-ruby/x25519-1.0.9
-2206272223 metadata/md5-cache/dev-ruby/xdr-3.0.1
-2206272223 metadata/md5-cache/dev-ruby/xdr-3.0.3
-2206272223 metadata/md5-cache/dev-ruby/xml-simple-1.1.9
-2206272223 metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
-2206272223 metadata/md5-cache/dev-ruby/xpath-3.2.0
-2206272223 metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
-2206272223 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
-2206272223 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
-2206272223 metadata/md5-cache/dev-ruby/yard-0.9.26
-2206272223 metadata/md5-cache/dev-ruby/yard-0.9.27
-2206272223 metadata/md5-cache/dev-ruby/yard-0.9.28
-2206272223 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
-2206272223 metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
-2206272223 metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
-2206272223 metadata/md5-cache/dev-ruby/zentest-4.12.1
-2207011610 metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
-2207011610 metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
-2207010840 metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
-2206302110 metadata/md5-cache/dev-ruby/certified-1.0.0
-2207010840 metadata/md5-cache/dev-ruby/rack-2.2.4
-2206292114 metadata/md5-cache/dev-ruby/rbst-0.6.5
-2206292114 metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
-2207011610 metadata/md5-cache/dev-ruby/recog-3.0.1
-2207011010 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
-2207011610 metadata/md5-cache/dev-ruby/virtus-2.0.0
-2207031310 metadata/md5-cache/dev-ruby/activerecord-6.0.5
-2207031310 metadata/md5-cache/dev-ruby/activerecord-6.1.6
-2207031310 metadata/md5-cache/dev-ruby/activerecord-7.0.3
-2207030910 metadata/md5-cache/dev-ruby/capybara-3.36.0
-2207030910 metadata/md5-cache/dev-ruby/capybara-3.37.1
-2207030910 metadata/md5-cache/dev-ruby/coercible-1.0.1
-2207050840 metadata/md5-cache/dev-ruby/flog-4.6.6
-2207040840 metadata/md5-cache/dev-ruby/kramdown-2.4.0
-2207031410 metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
-2207040840 metadata/md5-cache/dev-ruby/path_expander-1.1.1
-2207041640 metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
-2207041640 metadata/md5-cache/dev-ruby/rjb-1.6.5
-2207050840 metadata/md5-cache/dev-ruby/simplecov-0.21.2
-2207050840 metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
-2207031410 metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
-2207060840 metadata/md5-cache/dev-ruby/minitest-5.16.2
-2207060840 metadata/md5-cache/dev-ruby/msgpack-1.5.3
-2207060840 metadata/md5-cache/dev-ruby/octokit-4.25.1
-2207060840 metadata/md5-cache/dev-ruby/paint-2.3.0
-2207071940 metadata/md5-cache/dev-ruby/Manifest.gz
-2207071940 metadata/md5-cache/dev-ruby/actionpack-6.0.5
-2207071940 metadata/md5-cache/dev-ruby/actionview-6.0.5
-2207071940 metadata/md5-cache/dev-ruby/railties-6.0.5
-2207070810 metadata/md5-cache/dev-ruby/typeprof-0.21.3
+2207092311 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
+2207101240 metadata/md5-cache/dev-ruby/Manifest.gz
+2207092311 metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+2207092311 metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
+2207092311 metadata/md5-cache/dev-ruby/acme-client-2.0.8
+2207092311 metadata/md5-cache/dev-ruby/acme-client-2.0.9
+2207092311 metadata/md5-cache/dev-ruby/actioncable-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/actioncable-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actioncable-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actioncable-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actionmailer-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/actionpack-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/actionpack-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actionpack-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actionpack-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
+2207092311 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
+2207092311 metadata/md5-cache/dev-ruby/actiontext-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actiontext-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actiontext-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/actionview-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/actionview-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/actionview-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/actionview-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/actionview-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/actionview-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/activejob-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/activejob-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/activejob-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/activejob-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/activejob-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/activejob-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/activeldap-5.2.4
+2207092311 metadata/md5-cache/dev-ruby/activeldap-6.0.4
+2207092311 metadata/md5-cache/dev-ruby/activeldap-6.1.0
+2207092311 metadata/md5-cache/dev-ruby/activemodel-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/activemodel-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/activemodel-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/activemodel-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
+2207092311 metadata/md5-cache/dev-ruby/activerecord-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/activerecord-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/activerecord-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/activerecord-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/activestorage-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/activestorage-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/activestorage-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/activestorage-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/activesupport-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/activesupport-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/activesupport-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/activesupport-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
+2207092311 metadata/md5-cache/dev-ruby/addressable-2.8.0
+2207092311 metadata/md5-cache/dev-ruby/ae-1.8.2-r1
+2207092311 metadata/md5-cache/dev-ruby/afm-0.2.2-r1
+2207092311 metadata/md5-cache/dev-ruby/airbrussh-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/allison-2.0.3-r4
+2207092311 metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/amatch-0.4.1
+2207092311 metadata/md5-cache/dev-ruby/ammeter-1.1.5
+2207092311 metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
+2207092311 metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
+2207092311 metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
+2207092311 metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
+2207092311 metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
+2207092311 metadata/md5-cache/dev-ruby/arel-9.0.0
+2207092311 metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
+2207092311 metadata/md5-cache/dev-ruby/ascii85-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
+2207092311 metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
+2207092311 metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
+2207092311 metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
+2207092311 metadata/md5-cache/dev-ruby/asciimath-1.0.9
+2207092311 metadata/md5-cache/dev-ruby/asciimath-2.0.3
+2207092311 metadata/md5-cache/dev-ruby/asciimath-2.0.4
+2207092311 metadata/md5-cache/dev-ruby/ast-2.4.2
+2207092311 metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
+2207092311 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
+2207092311 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.2.0
+2207092311 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
+2207092311 metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
+2207092311 metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+2207092311 metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+2207092311 metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+2207092311 metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
+2207092311 metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
+2207092311 metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
+2207092311 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
+2207092311 metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
+2207092311 metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
+2207092311 metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/aws-sigv4-1.5.0
+2207092311 metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
+2207092311 metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+2207092311 metadata/md5-cache/dev-ruby/backports-3.21.0
+2207092311 metadata/md5-cache/dev-ruby/backports-3.23.0
+2207092311 metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
+2207092311 metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
+2207092311 metadata/md5-cache/dev-ruby/barby-0.6.8
+2207092311 metadata/md5-cache/dev-ruby/base32-0.3.4
+2207092311 metadata/md5-cache/dev-ruby/base32-0.3.4-r1
+2207092311 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
+2207092311 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
+2207092311 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
+2207092311 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
+2207092311 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
+2207092311 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
+2207092311 metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
+2207092311 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
+2207092311 metadata/md5-cache/dev-ruby/bindata-2.4.10
+2207092311 metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
+2207092311 metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/bit-struct-0.17
+2207092311 metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
+2207092311 metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
+2207092311 metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
+2207092311 metadata/md5-cache/dev-ruby/bogus-0.1.6
+2207092311 metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
+2207092311 metadata/md5-cache/dev-ruby/brass-1.2.1-r1
+2207092311 metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
+2207092311 metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+2207092311 metadata/md5-cache/dev-ruby/bson-4.12.0
+2207092311 metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
+2207092311 metadata/md5-cache/dev-ruby/buftok-0.3.0
+2207092311 metadata/md5-cache/dev-ruby/builder-3.2.4
+2207092311 metadata/md5-cache/dev-ruby/builder-3.2.4-r1
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.1.4
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.18
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.24
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.25
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.29
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.31
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.2.33
+2207092311 metadata/md5-cache/dev-ruby/bundler-2.3.8
+2207092311 metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
+2207092311 metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
+2207092311 metadata/md5-cache/dev-ruby/bunny-2.17.0
+2207092311 metadata/md5-cache/dev-ruby/bunny-2.19.0
+2207092311 metadata/md5-cache/dev-ruby/c21e-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
+2207092311 metadata/md5-cache/dev-ruby/capistrano-3.16.0
+2207092311 metadata/md5-cache/dev-ruby/capistrano-3.17.0
+2207092311 metadata/md5-cache/dev-ruby/capybara-3.36.0
+2207092311 metadata/md5-cache/dev-ruby/capybara-3.37.1
+2207092311 metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/certified-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
+2207092311 metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
+2207092311 metadata/md5-cache/dev-ruby/childprocess-4.1.0
+2207092311 metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
+2207092311 metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/cinch-2.3.4
+2207092311 metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/climate_control-0.2.0
+2207092311 metadata/md5-cache/dev-ruby/climate_control-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+2207092311 metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
+2207092311 metadata/md5-cache/dev-ruby/coderay-1.1.2
+2207092311 metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
+2207092311 metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
+2207092311 metadata/md5-cache/dev-ruby/coercible-1.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/coercible-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+2207092311 metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+2207092311 metadata/md5-cache/dev-ruby/color-1.8-r1
+2207092311 metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/colored-1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/colored2-3.1.2
+2207092311 metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+2207092311 metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+2207092311 metadata/md5-cache/dev-ruby/combustion-1.3.6
+2207092311 metadata/md5-cache/dev-ruby/combustion-1.3.7
+2207092311 metadata/md5-cache/dev-ruby/commander-4.6.0
+2207092311 metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
+2207092311 metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
+2207092311 metadata/md5-cache/dev-ruby/connection_pool-2.2.5
+2207092311 metadata/md5-cache/dev-ruby/contracts-0.16.1
+2207092311 metadata/md5-cache/dev-ruby/contracts-0.17
+2207092311 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+2207092311 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
+2207092311 metadata/md5-cache/dev-ruby/crack-0.4.4
+2207092311 metadata/md5-cache/dev-ruby/crass-1.0.6
+2207092311 metadata/md5-cache/dev-ruby/crass-1.0.6-r1
+2207092311 metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+2207092311 metadata/md5-cache/dev-ruby/cri-2.15.11
+2207092311 metadata/md5-cache/dev-ruby/cri-2.15.11-r1
+2207092311 metadata/md5-cache/dev-ruby/css_parser-1.10.0
+2207092311 metadata/md5-cache/dev-ruby/css_parser-1.11.0
+2207092311 metadata/md5-cache/dev-ruby/css_parser-1.9.0
+2207092311 metadata/md5-cache/dev-ruby/csv-3.2.2
+2207092311 metadata/md5-cache/dev-ruby/csv-3.2.3
+2207092311 metadata/md5-cache/dev-ruby/curb-0.9.11-r1
+2207092311 metadata/md5-cache/dev-ruby/curb-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/curses-1.4.2
+2207092311 metadata/md5-cache/dev-ruby/curses-1.4.3
+2207092311 metadata/md5-cache/dev-ruby/curses-1.4.4
+2207092311 metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
+2207092311 metadata/md5-cache/dev-ruby/daemons-1.3.1
+2207092311 metadata/md5-cache/dev-ruby/daemons-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/daemons-1.4.1
+2207092311 metadata/md5-cache/dev-ruby/dalli-2.7.11
+2207092311 metadata/md5-cache/dev-ruby/dalli-3.0.3
+2207092311 metadata/md5-cache/dev-ruby/dalli-3.2.1
+2207092311 metadata/md5-cache/dev-ruby/dalli-3.2.2
+2207092311 metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/date-3.2.2
+2207092311 metadata/md5-cache/dev-ruby/date_validator-0.11.0
+2207092311 metadata/md5-cache/dev-ruby/date_validator-0.12.0
+2207092311 metadata/md5-cache/dev-ruby/dbf-4.1.3
+2207092311 metadata/md5-cache/dev-ruby/dbf-4.1.6
+2207092311 metadata/md5-cache/dev-ruby/dbf-4.2.0
+2207092311 metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/ddplugin-1.0.3
+2207092311 metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+2207092311 metadata/md5-cache/dev-ruby/deep_merge-1.2.2
+2207092311 metadata/md5-cache/dev-ruby/delayer-1.2.1
+2207092311 metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
+2207092311 metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
+2207092311 metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
+2207092311 metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
+2207092311 metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+2207092311 metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
+2207092311 metadata/md5-cache/dev-ruby/digest-3.1.0
+2207092311 metadata/md5-cache/dev-ruby/digest-3.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/diva-1.0.2-r2
+2207092311 metadata/md5-cache/dev-ruby/diva-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/diva-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/dnsruby-1.61.9
+2207092311 metadata/md5-cache/dev-ruby/docile-1.3.5
+2207092311 metadata/md5-cache/dev-ruby/docile-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+2207092311 metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
+2207092311 metadata/md5-cache/dev-ruby/dotenv-2.7.6
+2207092311 metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
+2207092311 metadata/md5-cache/dev-ruby/dust-0.1.7-r3
+2207092311 metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
+2207092311 metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
+2207092311 metadata/md5-cache/dev-ruby/ed25519-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
+2207092311 metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+2207092311 metadata/md5-cache/dev-ruby/em-websocket-0.5.2
+2207092311 metadata/md5-cache/dev-ruby/em-websocket-0.5.3
+2207092311 metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
+2207092311 metadata/md5-cache/dev-ruby/equatable-0.7.0
+2207092311 metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
+2207092311 metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
+2207092311 metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
+2207092311 metadata/md5-cache/dev-ruby/ethon-0.14.0
+2207092311 metadata/md5-cache/dev-ruby/ethon-0.15.0
+2207092311 metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
+2207092311 metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
+2207092311 metadata/md5-cache/dev-ruby/excon-0.92.3
+2207092311 metadata/md5-cache/dev-ruby/execjs-2.8.1
+2207092311 metadata/md5-cache/dev-ruby/exifr-1.3.8
+2207092311 metadata/md5-cache/dev-ruby/exifr-1.3.9
+2207092311 metadata/md5-cache/dev-ruby/facter-3.14.23
+2207092311 metadata/md5-cache/dev-ruby/fakefs-1.2.3
+2207092311 metadata/md5-cache/dev-ruby/fakefs-1.3.2
+2207092311 metadata/md5-cache/dev-ruby/faker-2.19.0
+2207092311 metadata/md5-cache/dev-ruby/faraday-0.17.3
+2207092311 metadata/md5-cache/dev-ruby/faraday-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/faraday-1.3.1
+2207092311 metadata/md5-cache/dev-ruby/faraday-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
+2207092311 metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
+2207092311 metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
+2207092311 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
+2207092311 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
+2207092311 metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
+2207092311 metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
+2207092311 metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
+2207092311 metadata/md5-cache/dev-ruby/fattr-2.4.0
+2207092311 metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
+2207092311 metadata/md5-cache/dev-ruby/ferret-0.11.8.7-r1
+2207092311 metadata/md5-cache/dev-ruby/ffaker-2.20.0
+2207092311 metadata/md5-cache/dev-ruby/ffaker-2.21.0
+2207092311 metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
+2207092311 metadata/md5-cache/dev-ruby/ffi-1.15.5
+2207092311 metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/filesize-0.2.0
+2207092311 metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/filigree-0.4.1
+2207092311 metadata/md5-cache/dev-ruby/fivemat-1.3.7
+2207092311 metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
+2207092311 metadata/md5-cache/dev-ruby/flickraw-0.9.10
+2207092311 metadata/md5-cache/dev-ruby/flog-4.6.4
+2207092311 metadata/md5-cache/dev-ruby/flog-4.6.5
+2207092311 metadata/md5-cache/dev-ruby/flog-4.6.6
+2207092311 metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
+2207092311 metadata/md5-cache/dev-ruby/forgery-0.8.1
+2207092311 metadata/md5-cache/dev-ruby/forwardable-1.3.2
+2207092311 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
+2207092311 metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+2207092311 metadata/md5-cache/dev-ruby/fuubar-2.5.1
+2207092311 metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
+2207092311 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
+2207092311 metadata/md5-cache/dev-ruby/gh-0.18.0-r1
+2207092311 metadata/md5-cache/dev-ruby/gherkin-5.1.0
+2207092311 metadata/md5-cache/dev-ruby/gist-6.0.0
+2207092311 metadata/md5-cache/dev-ruby/git-1.10.2
+2207092311 metadata/md5-cache/dev-ruby/git-1.11.0
+2207092311 metadata/md5-cache/dev-ruby/globalid-0.6.0
+2207092311 metadata/md5-cache/dev-ruby/globalid-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
+2207092311 metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
+2207092311 metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
+2207092311 metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
+2207092311 metadata/md5-cache/dev-ruby/gruff-0.14.0
+2207092311 metadata/md5-cache/dev-ruby/gruff-0.15.0
+2207092311 metadata/md5-cache/dev-ruby/gruff-0.16.0
+2207092311 metadata/md5-cache/dev-ruby/gruff-0.17.0
+2207092311 metadata/md5-cache/dev-ruby/gruff-0.18.0
+2207092311 metadata/md5-cache/dev-ruby/haml-5.2.2
+2207092311 metadata/md5-cache/dev-ruby/haml-rails-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
+2207092311 metadata/md5-cache/dev-ruby/hashdiff-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+2207092311 metadata/md5-cache/dev-ruby/hashie-3.6.0
+2207092311 metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/hashie-5.0.0
+2207092311 metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/hiera-3.8.0
+2207092311 metadata/md5-cache/dev-ruby/hiera-3.9.0
+2207092311 metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+2207092311 metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+2207092311 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
+2207092311 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
+2207092311 metadata/md5-cache/dev-ruby/highline-2.0.3
+2207092311 metadata/md5-cache/dev-ruby/highline-2.0.3-r1
+2207092311 metadata/md5-cache/dev-ruby/hipchat-1.6.0
+2207092311 metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
+2207092311 metadata/md5-cache/dev-ruby/histogram-0.2.4.1
+2207092311 metadata/md5-cache/dev-ruby/hitimes-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/hocon-1.3.1
+2207092311 metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
+2207092311 metadata/md5-cache/dev-ruby/hoe-3.21.0
+2207092311 metadata/md5-cache/dev-ruby/hoe-3.23.1
+2207092311 metadata/md5-cache/dev-ruby/hoe-3.24.0
+2207092311 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+2207092311 metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
+2207092311 metadata/md5-cache/dev-ruby/http-4.1.1
+2207092311 metadata/md5-cache/dev-ruby/http-4.4.1
+2207092311 metadata/md5-cache/dev-ruby/http-accept-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
+2207092311 metadata/md5-cache/dev-ruby/http-cookie-1.0.4
+2207092311 metadata/md5-cache/dev-ruby/http-cookie-1.0.5
+2207092311 metadata/md5-cache/dev-ruby/http-form_data-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
+2207092311 metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
+2207092311 metadata/md5-cache/dev-ruby/httparty-0.20.0
+2207092311 metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
+2207092311 metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
+2207092311 metadata/md5-cache/dev-ruby/i18n-1.10.0
+2207092311 metadata/md5-cache/dev-ruby/i18n-1.8.10
+2207092311 metadata/md5-cache/dev-ruby/i18n-1.8.11
+2207092311 metadata/md5-cache/dev-ruby/i18n-1.8.9
+2207092311 metadata/md5-cache/dev-ruby/i18n-1.9.1
+2207092311 metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+2207092311 metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
+2207092311 metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
+2207092311 metadata/md5-cache/dev-ruby/image_processing-1.12.2
+2207092311 metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
+2207092311 metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/instance_storage-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
+2207092311 metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+2207092311 metadata/md5-cache/dev-ruby/io-wait-0.2.1
+2207092311 metadata/md5-cache/dev-ruby/io-wait-0.2.3
+2207092311 metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
+2207092311 metadata/md5-cache/dev-ruby/itextomml-1.6.1
+2207092311 metadata/md5-cache/dev-ruby/jbuilder-2.10.1
+2207092311 metadata/md5-cache/dev-ruby/jbuilder-2.11.2
+2207092311 metadata/md5-cache/dev-ruby/jbuilder-2.11.5
+2207092311 metadata/md5-cache/dev-ruby/jmespath-1.6.1
+2207092311 metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
+2207092311 metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
+2207092311 metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+2207092311 metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/json-2.5.1-r1
+2207092311 metadata/md5-cache/dev-ruby/json-2.6.1
+2207092311 metadata/md5-cache/dev-ruby/json-2.6.2
+2207092311 metadata/md5-cache/dev-ruby/json_schema-0.20.9
+2207092311 metadata/md5-cache/dev-ruby/jwt-2.2.3
+2207092311 metadata/md5-cache/dev-ruby/jwt-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/jwt-2.4.0
+2207092311 metadata/md5-cache/dev-ruby/jwt-2.4.1
+2207092311 metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
+2207092311 metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/kpeg-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/kpeg-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/kpeg-1.3.1
+2207092311 metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
+2207092311 metadata/md5-cache/dev-ruby/kramdown-2.3.2
+2207092311 metadata/md5-cache/dev-ruby/kramdown-2.4.0
+2207092311 metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/launchy-2.5.0
+2207092311 metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
+2207092311 metadata/md5-cache/dev-ruby/letter_opener-1.8.0
+2207092311 metadata/md5-cache/dev-ruby/letter_opener-1.8.1
+2207092311 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
+2207092311 metadata/md5-cache/dev-ruby/libusb-0.6.4
+2207092311 metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
+2207092311 metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
+2207092311 metadata/md5-cache/dev-ruby/liquid-5.0.1
+2207092311 metadata/md5-cache/dev-ruby/liquid-5.1.0
+2207092311 metadata/md5-cache/dev-ruby/liquid-5.2.0
+2207092311 metadata/md5-cache/dev-ruby/liquid-5.3.0
+2207092311 metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/liquid-c-4.1.0
+2207092311 metadata/md5-cache/dev-ruby/listen-3.5.1
+2207092311 metadata/md5-cache/dev-ruby/listen-3.6.0
+2207092311 metadata/md5-cache/dev-ruby/listen-3.7.0
+2207092311 metadata/md5-cache/dev-ruby/listen-3.7.1
+2207092311 metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
+2207092311 metadata/md5-cache/dev-ruby/locale-2.1.3
+2207092311 metadata/md5-cache/dev-ruby/localhost-1.1.9
+2207092311 metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
+2207092311 metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
+2207092311 metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
+2207092311 metadata/md5-cache/dev-ruby/logue-1.0.18
+2207092311 metadata/md5-cache/dev-ruby/loofah-2.12.0
+2207092311 metadata/md5-cache/dev-ruby/loofah-2.14.0
+2207092311 metadata/md5-cache/dev-ruby/loofah-2.15.0
+2207092311 metadata/md5-cache/dev-ruby/loofah-2.18.0
+2207092311 metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
+2207092311 metadata/md5-cache/dev-ruby/lumberjack-1.2.7
+2207092311 metadata/md5-cache/dev-ruby/lumberjack-1.2.8
+2207092311 metadata/md5-cache/dev-ruby/mab-0.0.3-r2
+2207092311 metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+2207092311 metadata/md5-cache/dev-ruby/magic-0.2.9-r2
+2207092311 metadata/md5-cache/dev-ruby/mail-2.7.1-r1
+2207092311 metadata/md5-cache/dev-ruby/maildir-2.2.3
+2207092311 metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
+2207092311 metadata/md5-cache/dev-ruby/marcel-1.0.2
+2207092311 metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
+2207092311 metadata/md5-cache/dev-ruby/mash-0.1.1-r3
+2207092311 metadata/md5-cache/dev-ruby/matrix-0.4.2
+2207092311 metadata/md5-cache/dev-ruby/maxitest-3.7.0
+2207092311 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+2207092311 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
+2207092311 metadata/md5-cache/dev-ruby/mechanize-2.8.4
+2207092311 metadata/md5-cache/dev-ruby/mechanize-2.8.5
+2207092311 metadata/md5-cache/dev-ruby/memo_wise-1.6.0
+2207092311 metadata/md5-cache/dev-ruby/memo_wise-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/memoist-0.16.2
+2207092311 metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
+2207092311 metadata/md5-cache/dev-ruby/mercenary-0.4.0
+2207092311 metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
+2207092311 metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
+2207092311 metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
+2207092311 metadata/md5-cache/dev-ruby/method_source-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/middleware-0.1.0
+2207092311 metadata/md5-cache/dev-ruby/mime-types-2.99.3
+2207092311 metadata/md5-cache/dev-ruby/mime-types-3.3.1
+2207092311 metadata/md5-cache/dev-ruby/mime-types-3.4.1
+2207092311 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
+2207092311 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.1115
+2207092311 metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
+2207092311 metadata/md5-cache/dev-ruby/mimemagic-0.3.10
+2207092311 metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
+2207092311 metadata/md5-cache/dev-ruby/mimemagic-0.4.3
+2207092311 metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
+2207092311 metadata/md5-cache/dev-ruby/mini_magick-4.11.0
+2207092311 metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
+2207092311 metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+2207092311 metadata/md5-cache/dev-ruby/mini_mime-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/mini_mime-1.1.2
+2207092311 metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
+2207092311 metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
+2207092311 metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
+2207092311 metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
+2207092311 metadata/md5-cache/dev-ruby/minitar-0.9
+2207092311 metadata/md5-cache/dev-ruby/minitar-0.9-r1
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.13.0
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.14.3
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.14.4
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.15.0
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.16.0
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.16.1
+2207092311 metadata/md5-cache/dev-ruby/minitest-5.16.2
+2207092311 metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
+2207092311 metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+2207092311 metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+2207092311 metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+2207092311 metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+2207092311 metadata/md5-cache/dev-ruby/mocha-1.13.0
+2207092311 metadata/md5-cache/dev-ruby/mocha-1.14.0
+2207092311 metadata/md5-cache/dev-ruby/moneta-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/moneta-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/moneta-1.4.1
+2207092311 metadata/md5-cache/dev-ruby/moneta-1.5.1
+2207092311 metadata/md5-cache/dev-ruby/mqtt-0.5.0
+2207092311 metadata/md5-cache/dev-ruby/msgpack-1.4.5
+2207092311 metadata/md5-cache/dev-ruby/msgpack-1.5.1
+2207092311 metadata/md5-cache/dev-ruby/msgpack-1.5.2
+2207092311 metadata/md5-cache/dev-ruby/msgpack-1.5.3
+2207092311 metadata/md5-cache/dev-ruby/multi_json-1.14.1
+2207092311 metadata/md5-cache/dev-ruby/multi_json-1.15.0
+2207092311 metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/multi_test-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
+2207092311 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+2207092311 metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
+2207092311 metadata/md5-cache/dev-ruby/multipart-post-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/multipart-post-2.2.2
+2207092311 metadata/md5-cache/dev-ruby/multipart-post-2.2.3
+2207092311 metadata/md5-cache/dev-ruby/mustache-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
+2207092311 metadata/md5-cache/dev-ruby/mustermann-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
+2207092311 metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
+2207092311 metadata/md5-cache/dev-ruby/mysql2-0.5.4
+2207092311 metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r2
+2207092311 metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+2207092311 metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
+2207092311 metadata/md5-cache/dev-ruby/naught-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/necromancer-0.5.1
+2207092311 metadata/md5-cache/dev-ruby/necromancer-0.7.0
+2207092311 metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
+2207092311 metadata/md5-cache/dev-ruby/net-ftp-0.1.3
+2207092311 metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+2207092311 metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
+2207092311 metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
+2207092311 metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/net-imap-0.2.3
+2207092311 metadata/md5-cache/dev-ruby/net-pop-0.1.1
+2207092311 metadata/md5-cache/dev-ruby/net-protocol-0.1.2
+2207092311 metadata/md5-cache/dev-ruby/net-protocol-0.1.3
+2207092311 metadata/md5-cache/dev-ruby/net-scp-3.0.0
+2207092311 metadata/md5-cache/dev-ruby/net-sftp-3.0.0
+2207092311 metadata/md5-cache/dev-ruby/net-smtp-0.3.1
+2207092311 metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+2207092311 metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
+2207092311 metadata/md5-cache/dev-ruby/net-ssh-7.0.1
+2207092311 metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/net-telnet-0.2.0
+2207092311 metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
+2207092311 metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/nio4r-2.5.4
+2207092311 metadata/md5-cache/dev-ruby/nio4r-2.5.8
+2207092311 metadata/md5-cache/dev-ruby/nokogiri-1.13.6
+2207092311 metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
+2207092311 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
+2207092311 metadata/md5-cache/dev-ruby/oauth-0.5.10
+2207092311 metadata/md5-cache/dev-ruby/oauth-0.5.8
+2207092311 metadata/md5-cache/dev-ruby/oauth2-1.4.7
+2207092311 metadata/md5-cache/dev-ruby/octokit-4.22.0
+2207092311 metadata/md5-cache/dev-ruby/octokit-4.23.0
+2207092311 metadata/md5-cache/dev-ruby/octokit-4.24.0
+2207092311 metadata/md5-cache/dev-ruby/octokit-4.25.0
+2207092311 metadata/md5-cache/dev-ruby/octokit-4.25.1
+2207092311 metadata/md5-cache/dev-ruby/omniauth-2.0.4
+2207092311 metadata/md5-cache/dev-ruby/omniauth-2.1.0
+2207092311 metadata/md5-cache/dev-ruby/open4-1.3.4-r1
+2207092311 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
+2207092311 metadata/md5-cache/dev-ruby/optimist-3.0.1
+2207092311 metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
+2207092311 metadata/md5-cache/dev-ruby/origin-2.3.1
+2207092311 metadata/md5-cache/dev-ruby/ox-2.14.10
+2207092311 metadata/md5-cache/dev-ruby/ox-2.14.11
+2207092311 metadata/md5-cache/dev-ruby/ox-2.14.8
+2207092311 metadata/md5-cache/dev-ruby/ox-2.14.9
+2207092311 metadata/md5-cache/dev-ruby/packetfu-1.1.13
+2207092311 metadata/md5-cache/dev-ruby/paint-2.2.1
+2207092311 metadata/md5-cache/dev-ruby/paint-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/parallel-1.22.1
+2207092311 metadata/md5-cache/dev-ruby/paramesan-0.1.1
+2207092311 metadata/md5-cache/dev-ruby/paramesan-1.0.1
+2207092311 metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/parser-3.0.3.2
+2207092311 metadata/md5-cache/dev-ruby/parser-3.1.0.0
+2207092311 metadata/md5-cache/dev-ruby/parser-3.1.1.0
+2207092311 metadata/md5-cache/dev-ruby/parser-3.1.2.0
+2207092311 metadata/md5-cache/dev-ruby/pastel-0.8.0
+2207092311 metadata/md5-cache/dev-ruby/path_expander-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/path_expander-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/pathutil-0.16.2
+2207092311 metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+2207092311 metadata/md5-cache/dev-ruby/pcaprub-0.13.1
+2207092311 metadata/md5-cache/dev-ruby/pdf-core-0.9.0
+2207092311 metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
+2207092311 metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
+2207092311 metadata/md5-cache/dev-ruby/pdf-reader-2.8.0
+2207092311 metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
+2207092311 metadata/md5-cache/dev-ruby/pdf-reader-2.9.1
+2207092311 metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
+2207092311 metadata/md5-cache/dev-ruby/pg-1.2.2
+2207092311 metadata/md5-cache/dev-ruby/pg-1.2.3
+2207092311 metadata/md5-cache/dev-ruby/pg-1.3.5
+2207092311 metadata/md5-cache/dev-ruby/pg-1.4.1
+2207092311 metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
+2207092311 metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+2207092311 metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+2207092311 metadata/md5-cache/dev-ruby/pkg-config-1.4.7
+2207092311 metadata/md5-cache/dev-ruby/plist-3.6.0
+2207092311 metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
+2207092311 metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
+2207092311 metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
+2207092311 metadata/md5-cache/dev-ruby/power_assert-1.1.7
+2207092311 metadata/md5-cache/dev-ruby/power_assert-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/power_assert-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/power_assert-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/prawn-2.4.0
+2207092311 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
+2207092311 metadata/md5-cache/dev-ruby/prime-0.1.2
+2207092311 metadata/md5-cache/dev-ruby/prime-0.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/propshaft-0.6.1
+2207092311 metadata/md5-cache/dev-ruby/propshaft-0.6.4
+2207092311 metadata/md5-cache/dev-ruby/pry-0.14.1
+2207092311 metadata/md5-cache/dev-ruby/psych-4.0.3
+2207092311 metadata/md5-cache/dev-ruby/psych-4.0.4
+2207092311 metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+2207092311 metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+2207092311 metadata/md5-cache/dev-ruby/public_suffix-4.0.7
+2207092311 metadata/md5-cache/dev-ruby/pundit-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
+2207092311 metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
+2207092311 metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
+2207092311 metadata/md5-cache/dev-ruby/qed-2.9.2-r1
+2207092311 metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+2207092311 metadata/md5-cache/dev-ruby/racc-1.5.2
+2207092311 metadata/md5-cache/dev-ruby/racc-1.5.2-r1
+2207092311 metadata/md5-cache/dev-ruby/racc-1.5.2-r2
+2207092311 metadata/md5-cache/dev-ruby/racc-1.6.0
+2207092311 metadata/md5-cache/dev-ruby/rack-2.2.3
+2207092311 metadata/md5-cache/dev-ruby/rack-2.2.3.1
+2207092311 metadata/md5-cache/dev-ruby/rack-2.2.4
+2207092311 metadata/md5-cache/dev-ruby/rack-attack-6.6.0
+2207092311 metadata/md5-cache/dev-ruby/rack-attack-6.6.1
+2207092311 metadata/md5-cache/dev-ruby/rack-cache-1.13.0
+2207092311 metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/rack-protection-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/rack-test-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/radius-0.7.5-r1
+2207092311 metadata/md5-cache/dev-ruby/rails-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/rails-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/rails-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/rails-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/rails-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/rails-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
+2207092311 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
+2207092311 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
+2207092311 metadata/md5-cache/dev-ruby/railties-5.2.8
+2207092311 metadata/md5-cache/dev-ruby/railties-6.0.5
+2207092311 metadata/md5-cache/dev-ruby/railties-6.1.5.1
+2207092311 metadata/md5-cache/dev-ruby/railties-6.1.6
+2207092311 metadata/md5-cache/dev-ruby/railties-7.0.2.4
+2207092311 metadata/md5-cache/dev-ruby/railties-7.0.3
+2207092311 metadata/md5-cache/dev-ruby/rainbow-3.0.0
+2207092311 metadata/md5-cache/dev-ruby/rainbow-3.1.1
+2207092311 metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+2207092311 metadata/md5-cache/dev-ruby/rake-13.0.4
+2207092311 metadata/md5-cache/dev-ruby/rake-13.0.6
+2207092311 metadata/md5-cache/dev-ruby/rake-13.0.6-r1
+2207092311 metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
+2207092311 metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
+2207092311 metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
+2207092311 metadata/md5-cache/dev-ruby/rantly-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/rash_alt-0.4.12
+2207092311 metadata/md5-cache/dev-ruby/rash_alt-0.4.9
+2207092311 metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+2207092311 metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
+2207092311 metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+2207092311 metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+2207092311 metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
+2207092311 metadata/md5-cache/dev-ruby/rbs-1.3.3
+2207092311 metadata/md5-cache/dev-ruby/rbs-1.5.1
+2207092311 metadata/md5-cache/dev-ruby/rbs-2.3.1
+2207092311 metadata/md5-cache/dev-ruby/rbs-2.3.2
+2207092311 metadata/md5-cache/dev-ruby/rbs-2.5.0
+2207092311 metadata/md5-cache/dev-ruby/rbs-2.5.1
+2207092311 metadata/md5-cache/dev-ruby/rbst-0.6.5
+2207092311 metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
+2207092311 metadata/md5-cache/dev-ruby/rbtree-0.4.5
+2207092311 metadata/md5-cache/dev-ruby/rcairo-1.16.6
+2207092311 metadata/md5-cache/dev-ruby/rcairo-1.17.5
+2207092311 metadata/md5-cache/dev-ruby/rchardet-1.8.0
+2207092311 metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
+2207092311 metadata/md5-cache/dev-ruby/rdoc-6.3.2
+2207092311 metadata/md5-cache/dev-ruby/rdoc-6.3.3
+2207092311 metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
+2207092311 metadata/md5-cache/dev-ruby/rdoc-6.4.0
+2207092311 metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
+2207092311 metadata/md5-cache/dev-ruby/recog-2.3.19
+2207092311 metadata/md5-cache/dev-ruby/recog-2.3.20
+2207092311 metadata/md5-cache/dev-ruby/recog-2.3.23
+2207092311 metadata/md5-cache/dev-ruby/recog-3.0.1
+2207092311 metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/redcarpet-3.5.1
+2207092311 metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
+2207092311 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
+2207101240 metadata/md5-cache/dev-ruby/redis-4.7.1
+2207092311 metadata/md5-cache/dev-ruby/ref-2.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
+2207092311 metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
+2207092311 metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
+2207092311 metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/request_store-1.5.0
+2207092311 metadata/md5-cache/dev-ruby/request_store-1.5.1
+2207092311 metadata/md5-cache/dev-ruby/rest-client-2.1.0
+2207092311 metadata/md5-cache/dev-ruby/rexical-1.0.7
+2207092311 metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
+2207092311 metadata/md5-cache/dev-ruby/rexml-3.2.5
+2207092311 metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
+2207092311 metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
+2207092311 metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
+2207092311 metadata/md5-cache/dev-ruby/rjb-1.6.5
+2207092311 metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
+2207092311 metadata/md5-cache/dev-ruby/rmagick-4.2.2
+2207092311 metadata/md5-cache/dev-ruby/rmagick-4.2.3
+2207092311 metadata/md5-cache/dev-ruby/rmagick-4.2.4
+2207092311 metadata/md5-cache/dev-ruby/rmagick-4.2.5
+2207092311 metadata/md5-cache/dev-ruby/roadie-4.0.0
+2207092311 metadata/md5-cache/dev-ruby/roadie-5.0.0
+2207092311 metadata/md5-cache/dev-ruby/roadie-5.0.1
+2207092311 metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/robots-0.10.1-r3
+2207092311 metadata/md5-cache/dev-ruby/rotp-6.2.0
+2207092311 metadata/md5-cache/dev-ruby/rouge-3.26.0
+2207092311 metadata/md5-cache/dev-ruby/rouge-3.26.1
+2207092311 metadata/md5-cache/dev-ruby/rouge-3.27.0
+2207092311 metadata/md5-cache/dev-ruby/rouge-3.28.0
+2207092311 metadata/md5-cache/dev-ruby/rouge-3.29.0
+2207092311 metadata/md5-cache/dev-ruby/rqrcode-2.1.0
+2207092311 metadata/md5-cache/dev-ruby/rqrcode-2.1.1
+2207092311 metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/rr-1.2.1
+2207092311 metadata/md5-cache/dev-ruby/rr-3.0.9
+2207092311 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-2.99.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-3.10.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-3.11.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+2207092311 metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+2207092311 metadata/md5-cache/dev-ruby/rspec-core-3.10.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-core-3.11.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+2207092311 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
+2207092311 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
+2207092311 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
+2207092311 metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
+2207092311 metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-rails-5.1.1
+2207092311 metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
+2207092311 metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+2207092311 metadata/md5-cache/dev-ruby/rspec-support-3.10.3
+2207092311 metadata/md5-cache/dev-ruby/rspec-support-3.11.0
+2207092311 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+2207092311 metadata/md5-cache/dev-ruby/rss-0.2.9
+2207092311 metadata/md5-cache/dev-ruby/rss-0.2.9-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
+2207092311 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
+2207092311 metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
+2207092311 metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
+2207092311 metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
+2207092311 metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
+2207092311 metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
+2207092311 metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
+2207092311 metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
+2207092311 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
+2207092311 metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
+2207092311 metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
+2207092311 metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
+2207092311 metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+2207092311 metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
+2207092311 metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
+2207092311 metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r3
+2207092311 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
+2207092311 metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
+2207092311 metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
+2207092311 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
+2207092311 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
+2207092311 metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+2207092311 metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+2207092311 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+2207092311 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
+2207092311 metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
+2207092311 metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
+2207092311 metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.0.3
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.0.9
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.1.6
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.2.14
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.2.22
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.2.33
+2207092311 metadata/md5-cache/dev-ruby/rubygems-3.3.8
+2207092311 metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
+2207092311 metadata/md5-cache/dev-ruby/rubypants-0.7.1
+2207092311 metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
+2207092311 metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
+2207092311 metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+2207092311 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+2207092311 metadata/md5-cache/dev-ruby/sanitize-6.0.0
+2207092311 metadata/md5-cache/dev-ruby/sass-3.5.7
+2207092311 metadata/md5-cache/dev-ruby/sass-3.5.7-r1
+2207092311 metadata/md5-cache/dev-ruby/sass-3.7.4
+2207092311 metadata/md5-cache/dev-ruby/sass-3.7.4-r1
+2207092311 metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/sass-rails-5.0.8
+2207092311 metadata/md5-cache/dev-ruby/sass-rails-5.1.0
+2207092311 metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
+2207092311 metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
+2207092311 metadata/md5-cache/dev-ruby/sawyer-0.9.1
+2207092311 metadata/md5-cache/dev-ruby/sdoc-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/seed-fu-2.3.9
+2207092311 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+2207092311 metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
+2207092311 metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
+2207092311 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+2207092311 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
+2207092311 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
+2207092311 metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/serialport-1.3.2
+2207092311 metadata/md5-cache/dev-ruby/serverengine-2.2.5
+2207092311 metadata/md5-cache/dev-ruby/serverengine-2.3.0
+2207092311 metadata/md5-cache/dev-ruby/set-1.0.2
+2207092311 metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
+2207092311 metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+2207092311 metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
+2207092311 metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
+2207092311 metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
+2207092311 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
+2207092311 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
+2207092311 metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+2207092311 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
+2207092311 metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+2207092311 metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
+2207092311 metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
+2207092311 metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
+2207092311 metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
+2207092311 metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
+2207092311 metadata/md5-cache/dev-ruby/simple-rss-1.3.3
+2207092311 metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
+2207092311 metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
+2207092311 metadata/md5-cache/dev-ruby/simplecov-0.19.1
+2207092311 metadata/md5-cache/dev-ruby/simplecov-0.21.2
+2207092311 metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
+2207092311 metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
+2207092311 metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
+2207092311 metadata/md5-cache/dev-ruby/sinatra-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/singleton-0.1.1
+2207092311 metadata/md5-cache/dev-ruby/six-0.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/slim-3.0.9-r1
+2207092311 metadata/md5-cache/dev-ruby/slim-4.1.0
+2207092311 metadata/md5-cache/dev-ruby/slim-4.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/slim-4.1.0-r2
+2207092311 metadata/md5-cache/dev-ruby/slop-4.9.2
+2207092311 metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/sorted_set-1.0.3
+2207092311 metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
+2207092311 metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
+2207092311 metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
+2207092311 metadata/md5-cache/dev-ruby/spring-3.1.1
+2207092311 metadata/md5-cache/dev-ruby/spring-4.0.0
+2207092311 metadata/md5-cache/dev-ruby/sprockets-3.7.2
+2207092311 metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
+2207092311 metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
+2207092311 metadata/md5-cache/dev-ruby/sprockets-4.0.2
+2207092311 metadata/md5-cache/dev-ruby/sprockets-4.1.0
+2207092311 metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/spy-1.0.2
+2207092311 metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
+2207092311 metadata/md5-cache/dev-ruby/sqlite3-1.4.3
+2207092311 metadata/md5-cache/dev-ruby/sqlite3-1.4.4
+2207092311 metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/sshkit-1.21.2
+2207092311 metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
+2207092311 metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/stomp-1.4.10
+2207092311 metadata/md5-cache/dev-ruby/stomp-1.4.9
+2207092311 metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
+2207092311 metadata/md5-cache/dev-ruby/stringio-3.0.1
+2207092311 metadata/md5-cache/dev-ruby/stringio-3.0.2
+2207092311 metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
+2207092311 metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
+2207092311 metadata/md5-cache/dev-ruby/strscan-3.0.1
+2207092311 metadata/md5-cache/dev-ruby/strscan-3.0.2
+2207092311 metadata/md5-cache/dev-ruby/strscan-3.0.3
+2207092311 metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
+2207092311 metadata/md5-cache/dev-ruby/sync-0.5.0
+2207092311 metadata/md5-cache/dev-ruby/syntax-1.2.2
+2207092311 metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+2207092311 metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
+2207092311 metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
+2207092311 metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
+2207092311 metadata/md5-cache/dev-ruby/temple-0.8.2
+2207092311 metadata/md5-cache/dev-ruby/temple-0.8.2-r1
+2207092311 metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
+2207092311 metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
+2207092311 metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/terminal-table-3.0.2
+2207092311 metadata/md5-cache/dev-ruby/test-unit-3.3.9
+2207092311 metadata/md5-cache/dev-ruby/test-unit-3.4.9
+2207092311 metadata/md5-cache/dev-ruby/test-unit-3.5.3
+2207092311 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
+2207092311 metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
+2207092311 metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
+2207092311 metadata/md5-cache/dev-ruby/text-1.3.1-r1
+2207092311 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
+2207092311 metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
+2207092311 metadata/md5-cache/dev-ruby/thor-1.1.0
+2207092311 metadata/md5-cache/dev-ruby/thor-1.2.1
+2207092311 metadata/md5-cache/dev-ruby/thread_order-1.1.1
+2207092311 metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
+2207092311 metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
+2207092311 metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
+2207092311 metadata/md5-cache/dev-ruby/tilt-2.0.10
+2207092311 metadata/md5-cache/dev-ruby/tilt-2.0.10-r1
+2207092311 metadata/md5-cache/dev-ruby/time-0.2.0
+2207092311 metadata/md5-cache/dev-ruby/timecop-0.9.4
+2207092311 metadata/md5-cache/dev-ruby/timecop-0.9.5
+2207092311 metadata/md5-cache/dev-ruby/timeout-0.2.0
+2207092311 metadata/md5-cache/dev-ruby/timeout-0.3.0
+2207092311 metadata/md5-cache/dev-ruby/timers-4.3.3
+2207092311 metadata/md5-cache/dev-ruby/tins-1.29.1
+2207092311 metadata/md5-cache/dev-ruby/tins-1.31.0
+2207092311 metadata/md5-cache/dev-ruby/tins-1.31.1
+2207092311 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
+2207092311 metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+2207092311 metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/tomlrb-2.0.2
+2207092311 metadata/md5-cache/dev-ruby/tomlrb-2.0.3
+2207092311 metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
+2207092311 metadata/md5-cache/dev-ruby/travis-1.10.0-r1
+2207092311 metadata/md5-cache/dev-ruby/travis-1.11.0
+2207092311 metadata/md5-cache/dev-ruby/travis-1.11.1
+2207092311 metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
+2207092311 metadata/md5-cache/dev-ruby/trollop-2.9.10
+2207092311 metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
+2207092311 metadata/md5-cache/dev-ruby/ttfunk-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/tty-color-0.6.0
+2207092311 metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
+2207092311 metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+2207092311 metadata/md5-cache/dev-ruby/tty-editor-0.7.0
+2207092311 metadata/md5-cache/dev-ruby/tty-file-0.10.0
+2207092311 metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+2207092311 metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+2207092311 metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+2207092311 metadata/md5-cache/dev-ruby/tty-which-0.5.0
+2207092311 metadata/md5-cache/dev-ruby/turbolinks-5.2.1
+2207092311 metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
+2207092311 metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
+2207092311 metadata/md5-cache/dev-ruby/typeprof-0.15.2
+2207092311 metadata/md5-cache/dev-ruby/typeprof-0.21.2
+2207092311 metadata/md5-cache/dev-ruby/typeprof-0.21.3
+2207092311 metadata/md5-cache/dev-ruby/typhoeus-1.4.0
+2207092311 metadata/md5-cache/dev-ruby/tzinfo-1.2.9
+2207092311 metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+2207092311 metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
+2207092311 metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
+2207092311 metadata/md5-cache/dev-ruby/unf-0.1.4-r1
+2207092311 metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+2207092311 metadata/md5-cache/dev-ruby/unf_ext-0.0.8
+2207092311 metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
+2207092311 metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
+2207092311 metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
+2207092311 metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/unindent-1.0-r1
+2207092311 metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+2207092311 metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
+2207092311 metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
+2207092311 metadata/md5-cache/dev-ruby/vcard-0.3.0
+2207092311 metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
+2207092311 metadata/md5-cache/dev-ruby/vcr-4.0.0
+2207092311 metadata/md5-cache/dev-ruby/vcr-5.1.0
+2207092311 metadata/md5-cache/dev-ruby/vcr-6.0.0
+2207092311 metadata/md5-cache/dev-ruby/vcr-6.1.0
+2207092311 metadata/md5-cache/dev-ruby/virtus-1.0.5
+2207092311 metadata/md5-cache/dev-ruby/virtus-2.0.0
+2207092311 metadata/md5-cache/dev-ruby/vlad-2.7.1
+2207092311 metadata/md5-cache/dev-ruby/warden-1.2.9-r1
+2207092311 metadata/md5-cache/dev-ruby/web-console-3.7.0
+2207092311 metadata/md5-cache/dev-ruby/web-console-4.2.0
+2207092311 metadata/md5-cache/dev-ruby/webmock-3.14.0
+2207092311 metadata/md5-cache/dev-ruby/webrick-1.7.0
+2207092311 metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
+2207092311 metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+2207092311 metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
+2207092311 metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
+2207092311 metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+2207092311 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+2207092311 metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
+2207092311 metadata/md5-cache/dev-ruby/will_paginate-3.3.1
+2207092311 metadata/md5-cache/dev-ruby/windows_error-0.1.3
+2207092311 metadata/md5-cache/dev-ruby/windows_error-0.1.4
+2207092311 metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
+2207092311 metadata/md5-cache/dev-ruby/wisper-2.0.1
+2207092311 metadata/md5-cache/dev-ruby/x25519-1.0.9
+2207092311 metadata/md5-cache/dev-ruby/xdr-3.0.1
+2207092311 metadata/md5-cache/dev-ruby/xdr-3.0.3
+2207092311 metadata/md5-cache/dev-ruby/xml-simple-1.1.9
+2207092311 metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
+2207092311 metadata/md5-cache/dev-ruby/xpath-3.2.0
+2207092311 metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
+2207092311 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
+2207092311 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+2207092311 metadata/md5-cache/dev-ruby/yard-0.9.26
+2207092311 metadata/md5-cache/dev-ruby/yard-0.9.27
+2207092311 metadata/md5-cache/dev-ruby/yard-0.9.28
+2207092311 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+2207092311 metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
+2207092311 metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
+2207092311 metadata/md5-cache/dev-ruby/zentest-4.12.1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -45891,7 +46047,6 @@
 2204230009 metadata/md5-cache/dev-tcltk/tclxml-3.3.1-r1
 2206281115 metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
 2206281115 metadata/md5-cache/dev-tcltk/tclperl-3.2-r2
-2206292114 metadata/md5-cache/dev-tcltk/Manifest.gz
 2206291742 metadata/md5-cache/dev-tcltk/blt-2.5.3-r1
 2206291742 metadata/md5-cache/dev-tcltk/expect-5.45.4-r2
 2206291742 metadata/md5-cache/dev-tcltk/expect-5.45.4-r3
@@ -45907,6 +46062,8 @@
 2206291742 metadata/md5-cache/dev-tcltk/tkimg-1.4.9
 2206291742 metadata/md5-cache/dev-tcltk/tkzinc-3.3.6-r1
 2206291742 metadata/md5-cache/dev-tcltk/tls-1.7.22
+2207100010 metadata/md5-cache/dev-tcltk/Manifest.gz
+2207100010 metadata/md5-cache/dev-tcltk/bwidget-1.9.15
 1702282321 metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
 2001131939 metadata/md5-cache/dev-tex/serienbrief-0.2.5
 1912151409 metadata/md5-cache/dev-tex/style-check-0.14
@@ -46165,10 +46322,6 @@
 2206232040 metadata/md5-cache/dev-util/kubeval-0.16.1
 2206272223 metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
 2206272223 metadata/md5-cache/dev-util/anjuta-3.34.0-r2
-2206272223 metadata/md5-cache/dev-util/aruba-0.6.2-r2
-2206272223 metadata/md5-cache/dev-util/aruba-1.0.3-r1
-2206272223 metadata/md5-cache/dev-util/aruba-1.1.2-r1
-2206272223 metadata/md5-cache/dev-util/aruba-2.0.0
 2206272223 metadata/md5-cache/dev-util/bdelta-0.3.1-r1
 2206281115 metadata/md5-cache/dev-util/biew-6.1.0-r3
 2206272223 metadata/md5-cache/dev-util/bingrep-0.10.0
@@ -46222,27 +46375,6 @@
 2206272223 metadata/md5-cache/dev-util/crash-8.0.1
 2206272223 metadata/md5-cache/dev-util/crash-9999
 2206272223 metadata/md5-cache/dev-util/csup-20060318-r1
-2206272223 metadata/md5-cache/dev-util/cucumber-3.2.0
-2206272223 metadata/md5-cache/dev-util/cucumber-7.1.0
-2206272223 metadata/md5-cache/dev-util/cucumber-core-10.1.1
-2206272223 metadata/md5-cache/dev-util/cucumber-core-3.2.1
-2206272223 metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
-2206272223 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
-2206272223 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
-2206272223 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
-2206272223 metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
-2206272223 metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
-2206272223 metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
-2206272223 metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
-2206272223 metadata/md5-cache/dev-util/cucumber-messages-17.1.1
-2206272223 metadata/md5-cache/dev-util/cucumber-messages-18.0.0
-2206272223 metadata/md5-cache/dev-util/cucumber-rails-1.8.0
-2206272223 metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1
-2206272223 metadata/md5-cache/dev-util/cucumber-rails-2.5.1
-2206272223 metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
-2206272223 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
-2206272223 metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
-2206272223 metadata/md5-cache/dev-util/cucumber-wire-6.2.1
 2206272223 metadata/md5-cache/dev-util/cutils-1.6-r4
 2206272223 metadata/md5-cache/dev-util/debhelper-13.2.1
 2206272223 metadata/md5-cache/dev-util/difftastic-0.29.1
@@ -46284,7 +46416,6 @@
 2206281115 metadata/md5-cache/dev-util/hip-4.3.0
 2206281115 metadata/md5-cache/dev-util/hip-4.3.0-r1
 2206281115 metadata/md5-cache/dev-util/hip-4.3.0-r2
-2206281115 metadata/md5-cache/dev-util/hip-5.0.2-r2
 2206272223 metadata/md5-cache/dev-util/huc-0.1-r1
 2206272223 metadata/md5-cache/dev-util/hxd-0.70.02-r2
 2206281115 metadata/md5-cache/dev-util/icemon-3.3
@@ -46331,7 +46462,6 @@
 2206272223 metadata/md5-cache/dev-util/plan9port-0_pre20210321
 2206272223 metadata/md5-cache/dev-util/premake-5.0.0_alpha16
 2206291040 metadata/md5-cache/dev-util/promu-0.13.0
-2206272223 metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
 2206272223 metadata/md5-cache/dev-util/pscan-20000721-r1
 2206272223 metadata/md5-cache/dev-util/qbs-1.18.0
 2206272223 metadata/md5-cache/dev-util/qbs-1.19.1
@@ -46343,7 +46473,6 @@
 2206272223 metadata/md5-cache/dev-util/radare2-5.6.8-r1
 2206282010 metadata/md5-cache/dev-util/rats-2.4-r1
 2206272223 metadata/md5-cache/dev-util/rebar-2.6.4-r1
-2206272223 metadata/md5-cache/dev-util/rebar-3.18.0
 2206272223 metadata/md5-cache/dev-util/rinstall-0.1.1
 2206272223 metadata/md5-cache/dev-util/rinstall-0.2.0
 2206281115 metadata/md5-cache/dev-util/rocm-clang-ocl-4.3.0
@@ -46422,7 +46551,6 @@
 2206292114 metadata/md5-cache/dev-util/ROPgadget-6.8
 2206292114 metadata/md5-cache/dev-util/ROPgadget-9999
 2206292114 metadata/md5-cache/dev-util/Tensile-4.3.0-r1
-2206292114 metadata/md5-cache/dev-util/Tensile-5.0.2
 2206291742 metadata/md5-cache/dev-util/ald-0.1.7-r2
 2206292114 metadata/md5-cache/dev-util/android-tools-31.0.0_p1
 2206292114 metadata/md5-cache/dev-util/android-tools-31.0.3
@@ -46451,7 +46579,6 @@
 2206292114 metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
 2206292114 metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
 2206292114 metadata/md5-cache/dev-util/buildbot-worker-3.4.0
-2206292114 metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
 2206292114 metadata/md5-cache/dev-util/buildbot-worker-9999
 2206292114 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
 2206292114 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
@@ -46566,7 +46693,6 @@
 2206291742 metadata/md5-cache/dev-util/lttng-ust-2.12.2
 2206291742 metadata/md5-cache/dev-util/lttng-ust-2.12.4
 2206291742 metadata/md5-cache/dev-util/lttng-ust-2.13.2
-2206292114 metadata/md5-cache/dev-util/maturin-0.12.17
 2206291742 metadata/md5-cache/dev-util/mdds-2.0.3
 2206291742 metadata/md5-cache/dev-util/mdds-9999
 2206292114 metadata/md5-cache/dev-util/meld-3.20.4
@@ -46662,7 +46788,6 @@
 2206292114 metadata/md5-cache/dev-util/uncrustify-0.74.0
 2206292114 metadata/md5-cache/dev-util/uncrustify-9999
 2206292114 metadata/md5-cache/dev-util/unicorn-2.0.0_rc7
-2206292114 metadata/md5-cache/dev-util/unicorn-9999
 2206291742 metadata/md5-cache/dev-util/valgrind-3.16.1
 2206291742 metadata/md5-cache/dev-util/valgrind-3.17.0
 2206291742 metadata/md5-cache/dev-util/valgrind-3.18.1
@@ -46743,13 +46868,49 @@
 2207061210 metadata/md5-cache/dev-util/maturin-0.12.20
 2207060910 metadata/md5-cache/dev-util/meson-0.62.2
 2207060940 metadata/md5-cache/dev-util/uglifyjs-3.16.1
-2207072310 metadata/md5-cache/dev-util/Manifest.gz
 2207062240 metadata/md5-cache/dev-util/bear-3.0.17
 2207062240 metadata/md5-cache/dev-util/bear-3.0.19
 2207071410 metadata/md5-cache/dev-util/kdevelop-22.04.3
 2207071410 metadata/md5-cache/dev-util/kdevelop-php-22.04.3
 2207071410 metadata/md5-cache/dev-util/kdevelop-python-22.04.3
 2207072310 metadata/md5-cache/dev-util/meson-format-array-0
+2207100410 metadata/md5-cache/dev-util/Manifest.gz
+2207082040 metadata/md5-cache/dev-util/Tensile-5.0.2-r1
+2207092311 metadata/md5-cache/dev-util/aruba-0.6.2-r2
+2207092311 metadata/md5-cache/dev-util/aruba-1.0.3-r1
+2207092311 metadata/md5-cache/dev-util/aruba-1.1.2-r1
+2207092311 metadata/md5-cache/dev-util/aruba-2.0.0
+2207092340 metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
+2207091310 metadata/md5-cache/dev-util/cppcheck-2.8.1
+2207092311 metadata/md5-cache/dev-util/cucumber-3.2.0
+2207092311 metadata/md5-cache/dev-util/cucumber-7.1.0
+2207092311 metadata/md5-cache/dev-util/cucumber-core-10.1.1
+2207092311 metadata/md5-cache/dev-util/cucumber-core-3.2.1
+2207092311 metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
+2207092311 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
+2207092311 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
+2207092311 metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
+2207092311 metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+2207092311 metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
+2207092311 metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
+2207092311 metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
+2207092311 metadata/md5-cache/dev-util/cucumber-messages-17.1.1
+2207092311 metadata/md5-cache/dev-util/cucumber-messages-18.0.0
+2207092311 metadata/md5-cache/dev-util/cucumber-rails-1.8.0
+2207092311 metadata/md5-cache/dev-util/cucumber-rails-2.5.0-r1
+2207092311 metadata/md5-cache/dev-util/cucumber-rails-2.5.1
+2207092311 metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
+2207092311 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+2207092311 metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+2207092311 metadata/md5-cache/dev-util/cucumber-wire-6.2.1
+2207082110 metadata/md5-cache/dev-util/hip-5.0.2-r2
+2207092311 metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
+2207091040 metadata/md5-cache/dev-util/rebar-3.18.0-r1
+2207091040 metadata/md5-cache/dev-util/rebar-3.19.0
+2207082210 metadata/md5-cache/dev-util/rizin-0.4.0-r1
+2207091340 metadata/md5-cache/dev-util/unicorn-2.0.0
+2207091340 metadata/md5-cache/dev-util/unicorn-9999
+2207090740 metadata/md5-cache/dev-util/watchman-2022.07.04.00
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2103230739 metadata/md5-cache/dev-vcs/cvsutils-0.2.6
@@ -47106,7 +47267,6 @@
 2206221910 metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
 2206271040 metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r101
 2206272223 metadata/md5-cache/games-board/atakks-1.0-r2
-2206272223 metadata/md5-cache/games-board/camato-0.7.4-r2
 2206272223 metadata/md5-cache/games-board/chessx-1.5.4-r3
 2206281115 metadata/md5-cache/games-board/cockatrice-20210126
 2206281115 metadata/md5-cache/games-board/crafty-24.1-r1
@@ -47153,7 +47313,6 @@
 2206291742 metadata/md5-cache/games-board/sjeng-11.2_p8_p1
 2206291742 metadata/md5-cache/games-board/xboard-4.9.1
 2206291742 metadata/md5-cache/games-board/xmahjongg-3.7-r1
-2207041640 metadata/md5-cache/games-board/Manifest.gz
 2207041640 metadata/md5-cache/games-board/domination-1.1.1.6-r2
 2207022141 metadata/md5-cache/games-board/four-in-a-row-3.38.1
 2207022141 metadata/md5-cache/games-board/gnome-chess-42.0
@@ -47162,6 +47321,8 @@
 2207022141 metadata/md5-cache/games-board/iagno-3.38.1
 2207041640 metadata/md5-cache/games-board/megamek-0.34.10-r2
 2207022141 metadata/md5-cache/games-board/tali-40.7
+2207092311 metadata/md5-cache/games-board/Manifest.gz
+2207092311 metadata/md5-cache/games-board/camato-0.7.4-r2
 2109031939 metadata/md5-cache/games-emulation/emutos-1.1.1
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
 2106020309 metadata/md5-cache/games-emulation/mastergear-bin-4.9
@@ -47406,14 +47567,12 @@
 2206281115 metadata/md5-cache/games-misc/fortune-mod-3.14.0
 2206281115 metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
 2206272223 metadata/md5-cache/games-misc/little-inferno-20130509-r1
-2206272223 metadata/md5-cache/games-misc/lolcat-100.0.1-r1
 2206272223 metadata/md5-cache/games-misc/nyancat-1.5.2
 2206272223 metadata/md5-cache/games-misc/sdljoytest-11102003
 2206272223 metadata/md5-cache/games-misc/sex-1.0-r2
 2206281115 metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
 2206272223 metadata/md5-cache/games-misc/wumpus-1.4-r2
 2206272223 metadata/md5-cache/games-misc/xcruiser-0.30-r1
-2206292114 metadata/md5-cache/games-misc/Manifest.gz
 2206292114 metadata/md5-cache/games-misc/doge-3.6.0-r1
 2206291742 metadata/md5-cache/games-misc/lucidlife-0.9.2-r1
 2206292114 metadata/md5-cache/games-misc/opengfx-7.1
@@ -47424,6 +47583,8 @@
 2206292114 metadata/md5-cache/games-misc/usolitaire-0.2.1
 2206292114 metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
 2206291742 metadata/md5-cache/games-misc/xcowsay-1.6
+2207092311 metadata/md5-cache/games-misc/Manifest.gz
+2207092311 metadata/md5-cache/games-misc/lolcat-100.0.1-r1
 2104041139 metadata/md5-cache/games-mud/tf-5.0_beta8_p8
 2002230040 metadata/md5-cache/games-mud/tintin-2.01.8
 1807151809 metadata/md5-cache/games-mud/trebuchet-1.075-r1
@@ -47634,9 +47795,8 @@
 2206272223 metadata/md5-cache/games-server/pvpgn-1.8.5-r4
 2206281115 metadata/md5-cache/games-server/pvpgn-1.99.7.2.1-r1
 2206291742 metadata/md5-cache/games-server/monopd-0.10.2-r1
-2207041640 metadata/md5-cache/games-server/Manifest.gz
-2207041640 metadata/md5-cache/games-server/minecraft-server-1.18.2
-2207041640 metadata/md5-cache/games-server/minecraft-server-1.19
+2207100040 metadata/md5-cache/games-server/Manifest.gz
+2207100040 metadata/md5-cache/games-server/minecraft-server-1.19
 2104161439 metadata/md5-cache/games-simulation/senken-0.3.0-r1
 2202261509 metadata/md5-cache/games-simulation/simutrans-paksets-123.0.1
 2203240726 metadata/md5-cache/games-simulation/flightgear-data-9999
@@ -47655,7 +47815,6 @@
 2206281115 metadata/md5-cache/games-simulation/flightgear-9999
 2206272223 metadata/md5-cache/games-simulation/micropolis-1.0_p20180313
 2206281115 metadata/md5-cache/games-simulation/openrct2-0.4.0
-2206281115 metadata/md5-cache/games-simulation/openrct2-9999
 2206281115 metadata/md5-cache/games-simulation/openttd-12.2-r1
 2206281115 metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
 2206281115 metadata/md5-cache/games-simulation/searchandrescue-1.7.0-r1
@@ -47663,12 +47822,14 @@
 2206272223 metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
 2206272223 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2207011140 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
-2207011310 metadata/md5-cache/games-simulation/Manifest.gz
 2207011310 metadata/md5-cache/games-simulation/corsix-th-0.66-r1
 2206291742 metadata/md5-cache/games-simulation/crrcsim-0.9.13-r2
 2206291742 metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
 2206291742 metadata/md5-cache/games-simulation/simutrans-123.0.1-r1
 2206292114 metadata/md5-cache/games-simulation/singularity-1.00-r1
+2207100040 metadata/md5-cache/games-simulation/Manifest.gz
+2207100040 metadata/md5-cache/games-simulation/openrct2-0.4.1
+2207100040 metadata/md5-cache/games-simulation/openrct2-9999
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2203240726 metadata/md5-cache/games-sports/trophy-2.0.4
 2206221910 metadata/md5-cache/games-sports/billardgl-1.75-r2
@@ -48131,18 +48292,21 @@
 2207022141 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2207022141 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0
 2207022141 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2207060440 metadata/md5-cache/gui-libs/Manifest.gz
 2207060440 metadata/md5-cache/gui-libs/amtk-5.4.1
 2207060440 metadata/md5-cache/gui-libs/gtk-4.6.5
 2207060440 metadata/md5-cache/gui-libs/gtksourceview-5.4.2
 2207060440 metadata/md5-cache/gui-libs/libadwaita-1.1.2
 2207060440 metadata/md5-cache/gui-libs/tepl-6.0.2
+2207100310 metadata/md5-cache/gui-libs/Manifest.gz
+2207100310 metadata/md5-cache/gui-libs/libadwaita-1.1.3
+2207100310 metadata/md5-cache/gui-libs/libhandy-1.6.3
 2206272223 metadata/md5-cache/gui-wm/hikari-2.3.3
-2207022141 metadata/md5-cache/gui-wm/Manifest.gz
 2207022141 metadata/md5-cache/gui-wm/sway-1.7
-2207022141 metadata/md5-cache/gui-wm/sway-9999
 2207022141 metadata/md5-cache/gui-wm/wayfire-0.7.2
 2207022141 metadata/md5-cache/gui-wm/wayfire-9999
+2207081840 metadata/md5-cache/gui-wm/Manifest.gz
+2207081840 metadata/md5-cache/gui-wm/sway-1.7-r1
+2207081840 metadata/md5-cache/gui-wm/sway-9999
 2207041640 metadata/md5-cache/java-virtuals/Manifest.gz
 2207041640 metadata/md5-cache/java-virtuals/servlet-api-2.3-r1
 2207041640 metadata/md5-cache/java-virtuals/servlet-api-2.4-r1
@@ -48373,7 +48537,6 @@
 2206292114 metadata/md5-cache/kde-apps/kajongg-21.12.3
 2206292114 metadata/md5-cache/kde-apps/kig-21.12.3
 2206292114 metadata/md5-cache/kde-apps/lokalize-21.12.3
-2207071410 metadata/md5-cache/kde-apps/Manifest.gz
 2207071410 metadata/md5-cache/kde-apps/akonadi-22.04.3
 2207071410 metadata/md5-cache/kde-apps/akonadi-calendar-22.04.3
 2207071410 metadata/md5-cache/kde-apps/akonadi-contacts-22.04.3
@@ -48415,7 +48578,6 @@
 2207071410 metadata/md5-cache/kde-apps/kaccounts-providers-22.04.3
 2207071410 metadata/md5-cache/kde-apps/kaddressbook-22.04.3
 2207071410 metadata/md5-cache/kde-apps/kajongg-22.04.3
-2207071410 metadata/md5-cache/kde-apps/kalarm-22.04.3
 2207071410 metadata/md5-cache/kde-apps/kalgebra-22.04.3
 2207071410 metadata/md5-cache/kde-apps/kalzium-22.04.3
 2207071410 metadata/md5-cache/kde-apps/kamera-22.04.3
@@ -48598,6 +48760,8 @@
 2207071410 metadata/md5-cache/kde-apps/umbrello-22.04.3
 2207071410 metadata/md5-cache/kde-apps/yakuake-22.04.3
 2207071410 metadata/md5-cache/kde-apps/zeroconf-ioslave-22.04.3
+2207081610 metadata/md5-cache/kde-apps/Manifest.gz
+2207081610 metadata/md5-cache/kde-apps/kalarm-22.04.3
 2205251440 metadata/md5-cache/kde-frameworks/kf-env-5
 2206281115 metadata/md5-cache/kde-frameworks/attica-5.92.0
 2206281115 metadata/md5-cache/kde-frameworks/attica-5.95.0
@@ -48743,7 +48907,6 @@
 2206291040 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.95.0
 2206281115 metadata/md5-cache/kde-frameworks/threadweaver-5.92.0
 2206281115 metadata/md5-cache/kde-frameworks/threadweaver-5.95.0
-2206292310 metadata/md5-cache/kde-frameworks/Manifest.gz
 2206292114 metadata/md5-cache/kde-frameworks/breeze-icons-5.92.0
 2206292114 metadata/md5-cache/kde-frameworks/breeze-icons-5.95.0
 2206292114 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.92.0
@@ -48760,6 +48923,87 @@
 2206292114 metadata/md5-cache/kde-frameworks/ki18n-5.95.0
 2206292310 metadata/md5-cache/kde-frameworks/kio-5.95.0-r1
 2206292310 metadata/md5-cache/kde-frameworks/plasma-5.95.0-r4
+2207091740 metadata/md5-cache/kde-frameworks/Manifest.gz
+2207091740 metadata/md5-cache/kde-frameworks/attica-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/baloo-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/bluez-qt-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/breeze-icons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/countryflags-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/frameworkintegration-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kactivities-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kactivities-stats-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kapidox-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/karchive-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kauth-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kbookmarks-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcalendarcore-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcmutils-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcodecs-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcompletion-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kconfig-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcontacts-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcoreaddons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kcrash-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdav-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdbusaddons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdeclarative-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kded-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdelibs4support-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdesu-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdnssd-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kdoctools-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kemoticons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kfilemetadata-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kglobalaccel-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kguiaddons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kholidays-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/khtml-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/ki18n-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kiconthemes-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kidletime-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kimageformats-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kinit-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kio-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kirigami-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kitemmodels-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kitemviews-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kjobwidgets-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kjs-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/knewstuff-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/knotifications-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/knotifyconfig-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kpackage-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kparts-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kpeople-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kplotting-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kpty-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kquickcharts-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kross-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/krunner-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kservice-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/ktexteditor-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/ktextwidgets-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kunitconversion-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kwallet-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kwayland-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kwindowsystem-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/kxmlgui-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/oxygen-icons-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/plasma-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/prison-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/purpose-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/solid-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/sonnet-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/syndication-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.96.0
+2207091740 metadata/md5-cache/kde-frameworks/threadweaver-5.96.0
 2206281115 metadata/md5-cache/kde-misc/basket-2.49b
 2206281115 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2206281115 metadata/md5-cache/kde-misc/kdeconnect-21.12.3
@@ -49550,7 +49794,6 @@
 2206272223 metadata/md5-cache/media-gfx/pngquant-2.17.0
 2206272223 metadata/md5-cache/media-gfx/pngrewrite-1.4.0
 2206272223 metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
-2206272223 metadata/md5-cache/media-gfx/potrace-1.15
 2206272223 metadata/md5-cache/media-gfx/potrace-1.16
 2206272223 metadata/md5-cache/media-gfx/pqiv-2.11
 2206272223 metadata/md5-cache/media-gfx/pqiv-9999
@@ -49615,7 +49858,6 @@
 2206291742 metadata/md5-cache/media-gfx/geeqie-9999
 2206291742 metadata/md5-cache/media-gfx/gimp-2.10.28-r1
 2206291742 metadata/md5-cache/media-gfx/gimp-2.10.30
-2206291742 metadata/md5-cache/media-gfx/gimp-2.10.32
 2206292114 metadata/md5-cache/media-gfx/gimp-2.99.10-r1
 2206292114 metadata/md5-cache/media-gfx/gimp-9999
 2206292114 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
@@ -49647,9 +49889,7 @@
 2206291742 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
 2206291742 metadata/md5-cache/media-gfx/iscan-3.65.0
 2206292114 metadata/md5-cache/media-gfx/krita-5.0.8
-2206292114 metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20201123
 2206292114 metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20211015
-2206292114 metadata/md5-cache/media-gfx/mcomix-9999
 2206292114 metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
 2206291742 metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
 2206292114 metadata/md5-cache/media-gfx/netpaint-1.1.2
@@ -49667,8 +49907,6 @@
 2206291742 metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
 2206291742 metadata/md5-cache/media-gfx/pstoedit-3.75
 2206291742 metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
-2206292114 metadata/md5-cache/media-gfx/renderdoc-1.18-r2
-2206292114 metadata/md5-cache/media-gfx/renderdoc-1.19
 2206291742 metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
 2206292114 metadata/md5-cache/media-gfx/sane-backends-1.1.1-r2
 2206292114 metadata/md5-cache/media-gfx/scour-0.38.2
@@ -49740,9 +49978,16 @@
 2207070040 metadata/md5-cache/media-gfx/prusaslicer-2.6.0_pre20220601-r2
 2207070040 metadata/md5-cache/media-gfx/prusaslicer-2.6.0_pre20220620-r2
 2207071410 metadata/md5-cache/media-gfx/skanpage-22.04.3
-2207081440 metadata/md5-cache/media-gfx/Manifest.gz
 2207081440 metadata/md5-cache/media-gfx/argyllcms-2.3.1
 2207081110 metadata/md5-cache/media-gfx/graphviz-5.0.0
+2207101210 metadata/md5-cache/media-gfx/Manifest.gz
+2207090910 metadata/md5-cache/media-gfx/blender-3.2.1
+2207090140 metadata/md5-cache/media-gfx/exif-0.6.22-r1
+2207091540 metadata/md5-cache/media-gfx/freecad-0.20
+2207091340 metadata/md5-cache/media-gfx/gimp-2.10.32
+2207091910 metadata/md5-cache/media-gfx/mcomix-2.0.2
+2207091910 metadata/md5-cache/media-gfx/mcomix-9999
+2207100940 metadata/md5-cache/media-gfx/ristretto-0.12.3
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
@@ -49753,7 +49998,6 @@
 2108120640 metadata/md5-cache/media-libs/libcdr-0.1.7
 1911150539 metadata/md5-cache/media-libs/libclastfm-0.5
 2102261209 metadata/md5-cache/media-libs/libdvbcsa-1.1.0
-2002112051 metadata/md5-cache/media-libs/libdvbpsi-1.3.2
 2110120139 metadata/md5-cache/media-libs/libemf-1.0.13
 2111101609 metadata/md5-cache/media-libs/libextractor-1.9-r2
 2011142339 metadata/md5-cache/media-libs/libfishsound-1.0.0
@@ -50218,7 +50462,6 @@
 2206292114 metadata/md5-cache/media-libs/openimageio-2.3.13.0
 2206292114 metadata/md5-cache/media-libs/openimageio-2.3.15.0
 2206292114 metadata/md5-cache/media-libs/openimageio-2.3.16.0
-2206292114 metadata/md5-cache/media-libs/osl-1.11.17.0-r4
 2206292114 metadata/md5-cache/media-libs/osl-1.12.4.1-r2
 2206292114 metadata/md5-cache/media-libs/partio-1.10.1
 2206292114 metadata/md5-cache/media-libs/partio-1.14.6
@@ -50276,7 +50519,6 @@
 2206291742 metadata/md5-cache/media-libs/zimg-9999
 2207022141 metadata/md5-cache/media-libs/babl-0.1.88
 2207022141 metadata/md5-cache/media-libs/babl-0.1.90-r1
-2207022141 metadata/md5-cache/media-libs/babl-0.1.92
 2207022141 metadata/md5-cache/media-libs/babl-9999
 2207022141 metadata/md5-cache/media-libs/dav1d-0.9.2
 2207022141 metadata/md5-cache/media-libs/dav1d-1.0.0
@@ -50286,7 +50528,6 @@
 2207022141 metadata/md5-cache/media-libs/exiftool-12.42
 2207022141 metadata/md5-cache/media-libs/fcft-3.1.2-r1
 2207022141 metadata/md5-cache/media-libs/gegl-0.4.34
-2207022141 metadata/md5-cache/media-libs/gegl-0.4.36-r1
 2207022141 metadata/md5-cache/media-libs/gegl-9999
 2207022141 metadata/md5-cache/media-libs/gexiv2-0.14.0
 2207022141 metadata/md5-cache/media-libs/glu-9.0.2
@@ -50309,7 +50550,6 @@
 2207041640 metadata/md5-cache/media-libs/libbluray-1.3.0-r1
 2207041640 metadata/md5-cache/media-libs/libbluray-1.3.1
 2207041640 metadata/md5-cache/media-libs/libbluray-9999
-2207041640 metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8
 2207022141 metadata/md5-cache/media-libs/libchamplain-0.12.20
 2207021540 metadata/md5-cache/media-libs/libdvd-audio-1.0.0
 2207022141 metadata/md5-cache/media-libs/libepoxy-1.5.10
@@ -50363,8 +50603,18 @@
 2207080410 metadata/md5-cache/media-libs/opencv-4.6.0-r2
 2207080710 metadata/md5-cache/media-libs/rubberband-3.0.0
 2207071740 metadata/md5-cache/media-libs/zimg-3.0.4
-2207081110 metadata/md5-cache/media-libs/Manifest.gz
 2207081110 metadata/md5-cache/media-libs/opencv-4.5.5-r2
+2207101110 metadata/md5-cache/media-libs/Manifest.gz
+2207091140 metadata/md5-cache/media-libs/alsa-lib-1.2.7.2
+2207101010 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
+2207091340 metadata/md5-cache/media-libs/babl-0.1.92
+2207090710 metadata/md5-cache/media-libs/codec2-1.0.4
+2207091340 metadata/md5-cache/media-libs/gegl-0.4.36-r1
+2207100040 metadata/md5-cache/media-libs/gmmlib-22.1.5
+2207092311 metadata/md5-cache/media-libs/libcaca-0.99_beta19-r8
+2207082140 metadata/md5-cache/media-libs/libdmtx-0.7.7
+2207090910 metadata/md5-cache/media-libs/oidn-1.4.3
+2207090910 metadata/md5-cache/media-libs/osl-1.11.17.0-r4
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -50736,8 +50986,6 @@
 2206281115 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r5
 2206281115 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
 2206281115 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
-2206272223 metadata/md5-cache/media-plugins/x42-plugins-20220327
-2206272223 metadata/md5-cache/media-plugins/x42-plugins-20220605
 2206272223 metadata/md5-cache/media-plugins/x42-plugins-99999999
 2206291742 metadata/md5-cache/media-plugins/alsa-plugins-1.2.6
 2206291742 metadata/md5-cache/media-plugins/alsa-plugins-1.2.7.1
@@ -50832,8 +51080,9 @@
 2207031210 metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.3-r1
 2207051310 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.3
 2207060440 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.19
-2207071740 metadata/md5-cache/media-plugins/Manifest.gz
 2207071740 metadata/md5-cache/media-plugins/rev-plugins-0.8.1
+2207100640 metadata/md5-cache/media-plugins/Manifest.gz
+2207090740 metadata/md5-cache/media-plugins/x42-plugins-20220605
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
 2004131239 metadata/md5-cache/media-radio/dxcc-20191204
@@ -51143,11 +51392,9 @@
 2206281115 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
 2206281115 metadata/md5-cache/media-sound/zynaddsubfx-3.0.6
 2206291742 metadata/md5-cache/media-sound/abcmidi-2022.05.20
-2206291742 metadata/md5-cache/media-sound/abcmidi-2022.06.07
 2206291742 metadata/md5-cache/media-sound/abcmidi-2022.06.14
 2206291742 metadata/md5-cache/media-sound/alsa-tools-1.2.5
 2206291742 metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
-2206291742 metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2
 2206292114 metadata/md5-cache/media-sound/apetag-1.12-r3
 2206291742 metadata/md5-cache/media-sound/aqualung-1.1-r101
 2206292114 metadata/md5-cache/media-sound/ardour-6.9-r1
@@ -51238,7 +51485,6 @@
 2206291742 metadata/md5-cache/media-sound/ogmtools-1.5-r3
 2206291742 metadata/md5-cache/media-sound/opus-tools-0.2
 2206291742 metadata/md5-cache/media-sound/orpheus-1.6-r3
-2206291742 metadata/md5-cache/media-sound/pasystray-0.8.0-r1
 2206292114 metadata/md5-cache/media-sound/patchage-1.0.6
 2206291742 metadata/md5-cache/media-sound/pitchtune-0.0.4
 2206292114 metadata/md5-cache/media-sound/puddletag-2.1.1
@@ -51305,15 +51551,10 @@
 2207021540 metadata/md5-cache/media-sound/musescore-3.6.2-r1
 2207022141 metadata/md5-cache/media-sound/ncmpc-0.46
 2207022141 metadata/md5-cache/media-sound/ncmpc-0.47
-2207022141 metadata/md5-cache/media-sound/paprefs-1.2-r1
 2207022141 metadata/md5-cache/media-sound/pithos-1.5.1-r1
 2207022141 metadata/md5-cache/media-sound/playerctl-2.3.1
 2207022141 metadata/md5-cache/media-sound/pulseaudio-15.0-r2
 2207022141 metadata/md5-cache/media-sound/pulseaudio-15.0-r3
-2207022141 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
-2207022141 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
-2207022141 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
-2207050110 metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
 2207022141 metadata/md5-cache/media-sound/pulseeffects-4.8.7
 2207022141 metadata/md5-cache/media-sound/rhythmbox-3.4.5
 2207022141 metadata/md5-cache/media-sound/rhythmbox-3.4.6
@@ -51326,10 +51567,22 @@
 2207060710 metadata/md5-cache/media-sound/cmus-2.10.0
 2207060710 metadata/md5-cache/media-sound/cmus-9999
 2207071410 metadata/md5-cache/media-sound/elisa-22.04.3
-2207081440 metadata/md5-cache/media-sound/Manifest.gz
 2207081440 metadata/md5-cache/media-sound/picard-2.8.1
 2207081440 metadata/md5-cache/media-sound/picard-2.8.2
 2207081440 metadata/md5-cache/media-sound/picard-9999
+2207101440 metadata/md5-cache/media-sound/Manifest.gz
+2207090740 metadata/md5-cache/media-sound/abcmidi-2022.06.07
+2207101440 metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
+2207090410 metadata/md5-cache/media-sound/mpd-0.23.8
+2207090640 metadata/md5-cache/media-sound/paprefs-1.2-r2
+2207091110 metadata/md5-cache/media-sound/pasystray-0.8.0-r1
+2207090140 metadata/md5-cache/media-sound/pulseaudio-16.1
+2207082340 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+2207082340 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
+2207082340 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
+2207082340 metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
+2207082310 metadata/md5-cache/media-sound/qtractor-0.9.27
+2207091610 metadata/md5-cache/media-sound/wavpack-5.5.0
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -51516,7 +51769,6 @@
 2206291742 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
 2206291742 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r103
 2206291742 metadata/md5-cache/media-video/aegisub-9999
-2206292114 metadata/md5-cache/media-video/devedeng-4.16.0-r2
 2206292114 metadata/md5-cache/media-video/devedeng-4.17.0
 2206291742 metadata/md5-cache/media-video/dirac-1.0.2-r1
 2206291742 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
@@ -51543,7 +51795,6 @@
 2206292114 metadata/md5-cache/media-video/mpv-0.33.1-r3
 2206292114 metadata/md5-cache/media-video/mpv-0.34.0-r1
 2206292114 metadata/md5-cache/media-video/mpv-0.34.1-r1
-2206292114 metadata/md5-cache/media-video/mpv-9999
 2206291742 metadata/md5-cache/media-video/noad-0.8.7
 2206292114 metadata/md5-cache/media-video/obs-studio-27.2.3-r1
 2206292114 metadata/md5-cache/media-video/obs-studio-27.2.4
@@ -51598,23 +51849,29 @@
 2207040040 metadata/md5-cache/media-video/shotcut-9999
 2207022141 metadata/md5-cache/media-video/totem-42.0-r1
 2207031210 metadata/md5-cache/media-video/vdr-2.6.1
-2207050840 metadata/md5-cache/media-video/wireplumber-0.4.10-r4
-2207050910 metadata/md5-cache/media-video/wireplumber-0.4.10-r6
-2207050910 metadata/md5-cache/media-video/wireplumber-9999
 2207021440 metadata/md5-cache/media-video/yle-dl-20220610
 2207051040 metadata/md5-cache/media-video/yle-dl-20220704
 2207052110 metadata/md5-cache/media-video/vidcutter-6.0.5.1-r1
 2207060710 metadata/md5-cache/media-video/pipewire-0.3.53_p20220704-r1
 2207060940 metadata/md5-cache/media-video/pipewire-0.3.53_p20220705-r1
-2207060940 metadata/md5-cache/media-video/pipewire-9999
 2207070140 metadata/md5-cache/media-video/makemkv-1.17.0
 2207062240 metadata/md5-cache/media-video/mkvtoolnix-60.0.0
 2207062240 metadata/md5-cache/media-video/mkvtoolnix-61.0.0
 2207062240 metadata/md5-cache/media-video/mkvtoolnix-64.0.0
 2207062240 metadata/md5-cache/media-video/mkvtoolnix-67.0.0
-2207081110 metadata/md5-cache/media-video/Manifest.gz
-2207081110 metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r2
-2207081110 metadata/md5-cache/media-video/mkvtoolnix-9999
+2207101710 metadata/md5-cache/media-video/Manifest.gz
+2207101710 metadata/md5-cache/media-video/devedeng-4.17.0-r1
+2207090110 metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
+2207090110 metadata/md5-cache/media-video/mkvtoolnix-9999
+2207090610 metadata/md5-cache/media-video/mpv-9999
+2207090440 metadata/md5-cache/media-video/pipewire-0.3.54
+2207090440 metadata/md5-cache/media-video/pipewire-0.3.54-r1
+2207090440 metadata/md5-cache/media-video/pipewire-9999
+2207090440 metadata/md5-cache/media-video/wireplumber-0.4.10-r4
+2207090440 metadata/md5-cache/media-video/wireplumber-0.4.10-r6
+2207090440 metadata/md5-cache/media-video/wireplumber-0.4.11
+2207090710 metadata/md5-cache/media-video/wireplumber-0.4.11-r1
+2207090440 metadata/md5-cache/media-video/wireplumber-9999
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 2101201239 metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -51770,7 +52027,6 @@
 2206281115 metadata/md5-cache/net-analyzer/netperf-2.7.0-r3
 2206281115 metadata/md5-cache/net-analyzer/netperf-2.7.0-r4
 2206272223 metadata/md5-cache/net-analyzer/netpipe-3.7.2
-2206272223 metadata/md5-cache/net-analyzer/netselect-0.4-r1
 2206272223 metadata/md5-cache/net-analyzer/netselect-0.4-r2
 2206272223 metadata/md5-cache/net-analyzer/netselect-9999
 2206272223 metadata/md5-cache/net-analyzer/nettop-0.2.3-r2
@@ -51936,7 +52192,6 @@
 2206291742 metadata/md5-cache/net-analyzer/pktstat-1.8.5-r1
 2206291742 metadata/md5-cache/net-analyzer/pmacct-1.7.6-r2
 2206291742 metadata/md5-cache/net-analyzer/pmacct-1.7.6-r3
-2206291742 metadata/md5-cache/net-analyzer/pmacct-999999
 2206292114 metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
 2206291742 metadata/md5-cache/net-analyzer/prelude-lml-5.2.0
 2206292114 metadata/md5-cache/net-analyzer/pypacker-4.9
@@ -52020,10 +52275,13 @@
 2207071910 metadata/md5-cache/net-analyzer/gr-fosphor-9999
 2207070940 metadata/md5-cache/net-analyzer/zabbix-4.0.41
 2207070940 metadata/md5-cache/net-analyzer/zabbix-5.0.24
-2207081010 metadata/md5-cache/net-analyzer/Manifest.gz
 2207081010 metadata/md5-cache/net-analyzer/zabbix-6.0.5-r1
 2207081010 metadata/md5-cache/net-analyzer/zabbix-6.0.6-r1
 2207081010 metadata/md5-cache/net-analyzer/zabbix-6.2.0-r1
+2207101610 metadata/md5-cache/net-analyzer/Manifest.gz
+2207090910 metadata/md5-cache/net-analyzer/pmacct-1.7.7-r1
+2207090910 metadata/md5-cache/net-analyzer/pmacct-9999
+2207101610 metadata/md5-cache/net-analyzer/wapiti-3.1.3
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
@@ -52148,10 +52406,11 @@
 2206292114 metadata/md5-cache/net-dns/unbound-1.13.2-r1
 2206292114 metadata/md5-cache/net-dns/unbound-1.15.0
 2206292114 metadata/md5-cache/net-dns/unbound-1.16.0
-2207041640 metadata/md5-cache/net-dns/Manifest.gz
 2207022141 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r3
 2207022141 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2207041640 metadata/md5-cache/net-dns/libidn-1.38-r1
+2207081910 metadata/md5-cache/net-dns/Manifest.gz
+2207081910 metadata/md5-cache/net-dns/pdns-recursor-4.7.1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2206272223 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -52329,8 +52588,6 @@
 2206272223 metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
 2206272223 metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
 2206281610 metadata/md5-cache/net-im/zoom-5.11.1.3595
-2206292114 metadata/md5-cache/net-im/bitlbee-3.6-r1
-2206292114 metadata/md5-cache/net-im/bitlbee-9999
 2206291742 metadata/md5-cache/net-im/bitlbee-facebook-1.2.2
 2206291742 metadata/md5-cache/net-im/bitlbee-facebook-9999
 2206291742 metadata/md5-cache/net-im/bitlbee-steam-1.4.2
@@ -52361,7 +52618,6 @@
 2206292114 metadata/md5-cache/net-im/toxic-0.11.3
 2206292114 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r3
 2206291742 metadata/md5-cache/net-im/ysm-2.9.9.1-r2
-2207051310 metadata/md5-cache/net-im/Manifest.gz
 2207022141 metadata/md5-cache/net-im/cawbird-1.5-r2
 2207051210 metadata/md5-cache/net-im/ejabberd-22.05-r1
 2207051310 metadata/md5-cache/net-im/mattermost-desktop-bin-5.1.1
@@ -52370,6 +52626,11 @@
 2207022141 metadata/md5-cache/net-im/pidgin-2.14.9
 2207022141 metadata/md5-cache/net-im/sendxmpp-1.24
 2207021440 metadata/md5-cache/net-im/yowsup-3.3.0
+2207101610 metadata/md5-cache/net-im/Manifest.gz
+2207091310 metadata/md5-cache/net-im/bitlbee-3.6-r1
+2207091310 metadata/md5-cache/net-im/bitlbee-9999
+2207101610 metadata/md5-cache/net-im/neochat-22.06
+2207091140 metadata/md5-cache/net-im/synapse-1.62.0
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
@@ -52386,12 +52647,10 @@
 2203240726 metadata/md5-cache/net-irc/eggdrop-1.8.4-r1
 2203240726 metadata/md5-cache/net-irc/eggdrop-1.9.1
 2203240726 metadata/md5-cache/net-irc/eggdrop-1.9.2
-2203240726 metadata/md5-cache/net-irc/epic5-2.0.1-r1
 2204151010 metadata/md5-cache/net-irc/ngircd-26.1-r4
 2205141110 metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20220429
 2205141110 metadata/md5-cache/net-irc/limnoria-plugins-progval-20220513
 2206161940 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
-2206261110 metadata/md5-cache/net-irc/epic5-2.0.1-r2
 2206281115 metadata/md5-cache/net-irc/anope-2.0.10-r1
 2206281115 metadata/md5-cache/net-irc/anope-2.0.11
 2206272223 metadata/md5-cache/net-irc/dccserver-0.5-r1
@@ -52415,7 +52674,6 @@
 2206272223 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
 2206281115 metadata/md5-cache/net-irc/quassel-0.14.0-r1
 2206281115 metadata/md5-cache/net-irc/quassel-9999
-2206272223 metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
 2206272223 metadata/md5-cache/net-irc/rhapsody-0.28b
 2206272223 metadata/md5-cache/net-irc/scrollz-2.3-r1
 2206272223 metadata/md5-cache/net-irc/sic-1.2-r1
@@ -52445,7 +52703,6 @@
 2207022110 metadata/md5-cache/net-irc/irker-2.21
 2207022110 metadata/md5-cache/net-irc/irker-2.22
 2207032140 metadata/md5-cache/net-irc/irker-2.22-r2
-2207022141 metadata/md5-cache/net-irc/irssi-1.2.3
 2207022141 metadata/md5-cache/net-irc/irssi-9999
 2207022141 metadata/md5-cache/net-irc/pisg-0.73-r1
 2207022141 metadata/md5-cache/net-irc/polari-40.0
@@ -52455,8 +52712,10 @@
 2207030310 metadata/md5-cache/net-irc/unrealircd-6.0.4
 2207060440 metadata/md5-cache/net-irc/polari-42.0
 2207061040 metadata/md5-cache/net-irc/irssi-1.4.1
-2207071410 metadata/md5-cache/net-irc/Manifest.gz
 2207071410 metadata/md5-cache/net-irc/konversation-22.04.3
+2207092311 metadata/md5-cache/net-irc/Manifest.gz
+2207090940 metadata/md5-cache/net-irc/epic5-2.0.1-r2
+2207092311 metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
@@ -52470,7 +52729,6 @@
 2104040139 metadata/md5-cache/net-libs/libomemo-0.7.1-r2
 2109211539 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
 1907151840 metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
-2104060140 metadata/md5-cache/net-libs/rpcsvc-proto-0
 2105021409 metadata/md5-cache/net-libs/sofia-sip-1.12.11
 2112070940 metadata/md5-cache/net-libs/czmq-4.2.1
 2112130909 metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
@@ -52489,7 +52747,6 @@
 2204220411 metadata/md5-cache/net-libs/loudmouth-1.5.4
 2204291110 metadata/md5-cache/net-libs/libmnl-1.0.5
 2205171510 metadata/md5-cache/net-libs/libntlm-1.6
-2205191040 metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3
 2205260840 metadata/md5-cache/net-libs/libotr-4.1.1
 2205311240 metadata/md5-cache/net-libs/libqmi-1.30.6
 2206110910 metadata/md5-cache/net-libs/xdp-tools-1.2.3
@@ -52598,7 +52855,6 @@
 2206272223 metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1
 2206281115 metadata/md5-cache/net-libs/net6-1.3.14-r2
 2206272223 metadata/md5-cache/net-libs/netwib-5.39.0
-2206272223 metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
 2206272223 metadata/md5-cache/net-libs/nghttp2-1.47.0
 2206272223 metadata/md5-cache/net-libs/nghttp2-1.48.0
 2206281115 metadata/md5-cache/net-libs/nghttp3-0_pre20190912
@@ -52718,7 +52974,6 @@
 2206291742 metadata/md5-cache/net-libs/nDPI-3.4
 2206291742 metadata/md5-cache/net-libs/nDPI-4.0-r1
 2206291742 metadata/md5-cache/net-libs/nDPI-4.2
-2206291742 metadata/md5-cache/net-libs/nDPI-9999
 2206291742 metadata/md5-cache/net-libs/neon-0.32.2
 2206291742 metadata/md5-cache/net-libs/nghttp2-9999
 2206292114 metadata/md5-cache/net-libs/nodejs-14.19.3
@@ -52790,8 +53045,12 @@
 2207060440 metadata/md5-cache/net-libs/libnice-0.1.19
 2207060440 metadata/md5-cache/net-libs/libnma-1.8.40
 2207060440 metadata/md5-cache/net-libs/sofia-sip-1.13.8
-2207071410 metadata/md5-cache/net-libs/Manifest.gz
 2207071410 metadata/md5-cache/net-libs/libktorrent-22.04.3
+2207101710 metadata/md5-cache/net-libs/Manifest.gz
+2207090710 metadata/md5-cache/net-libs/nDPI-4.4
+2207090710 metadata/md5-cache/net-libs/nDPI-9999
+2207101110 metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
+2207101110 metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2009050439 metadata/md5-cache/net-mail/email-3.1.3-r1
@@ -52823,7 +53082,6 @@
 2204222110 metadata/md5-cache/net-mail/mu-1.6.10
 2206072340 metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
 2206072340 metadata/md5-cache/net-mail/postfix-logwatch-1.40.04
-2206092240 metadata/md5-cache/net-mail/mu-1.6.11
 2206151540 metadata/md5-cache/net-mail/postfix-logwatch-1.40.05
 2206211940 metadata/md5-cache/net-mail/qprint-1.1-r1
 2206272223 metadata/md5-cache/net-mail/altermime-0.3.11
@@ -52841,7 +53099,6 @@
 2206281115 metadata/md5-cache/net-mail/mailbase-1.8.1
 2206272223 metadata/md5-cache/net-mail/mailbox-count-0.0.5
 2206272223 metadata/md5-cache/net-mail/mailfront-2.22
-2206272223 metadata/md5-cache/net-mail/mailshears-0.0.5
 2206272223 metadata/md5-cache/net-mail/mairix-0.24
 2206272223 metadata/md5-cache/net-mail/mess822-0.58-r2
 2206272223 metadata/md5-cache/net-mail/mswatch-1.2.0-r1
@@ -52900,19 +53157,18 @@
 2206291742 metadata/md5-cache/net-mail/tpop3d-1.5.5-r4
 2206291742 metadata/md5-cache/net-mail/vchkuser-0.4-r1
 2206291742 metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
-2206291742 metadata/md5-cache/net-mail/ytnef-1.9.3
 2206291742 metadata/md5-cache/net-mail/ytnef-2.0
 2207022141 metadata/md5-cache/net-mail/grepmail-5.3111
 2207022141 metadata/md5-cache/net-mail/mhonarc-2.6.19
 2207030140 metadata/md5-cache/net-mail/mhonarc-gentoo-2.6.18-r3
-2207022141 metadata/md5-cache/net-mail/mu-1.7.23
-2207022141 metadata/md5-cache/net-mail/mu-1.8.1
 2207022141 metadata/md5-cache/net-mail/public-inbox-1.7.0
 2207042240 metadata/md5-cache/net-mail/public-inbox-1.8.0
 2207041910 metadata/md5-cache/net-mail/queue-repair-0.9.0-r2
 2207022141 metadata/md5-cache/net-mail/swaks-20201014.0
-2207080940 metadata/md5-cache/net-mail/Manifest.gz
-2207080940 metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1
+2207101610 metadata/md5-cache/net-mail/Manifest.gz
+2207091540 metadata/md5-cache/net-mail/dovecot-2.3.19.1-r1
+2207092311 metadata/md5-cache/net-mail/mailshears-0.0.5
+2207091340 metadata/md5-cache/net-mail/mu-1.8.5
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
 2105261539 metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
@@ -53084,7 +53340,6 @@
 2206272223 metadata/md5-cache/net-misc/ethflop-20191003-r1
 2206272223 metadata/md5-cache/net-misc/fakeidentd-2.6-r1
 2206281115 metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
-2206272223 metadata/md5-cache/net-misc/felix-3.1.3
 2206281115 metadata/md5-cache/net-misc/freerdp-2.7.0-r1
 2206281115 metadata/md5-cache/net-misc/freerdp-2.9999
 2206281115 metadata/md5-cache/net-misc/freerdp-9999
@@ -53115,8 +53370,6 @@
 2206272223 metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1
 2206272223 metadata/md5-cache/net-misc/linuxptp-2.0-r1
 2206272223 metadata/md5-cache/net-misc/mcproxy-1.1.1-r2
-2206272223 metadata/md5-cache/net-misc/mikutter-4.1.7
-2206272223 metadata/md5-cache/net-misc/mikutter-9999
 2206272223 metadata/md5-cache/net-misc/minissdpd-1.5.20190824
 2206272223 metadata/md5-cache/net-misc/minissdpd-1.5.20200928
 2206272223 metadata/md5-cache/net-misc/minissdpd-1.5.20211105
@@ -53137,7 +53390,6 @@
 2206281115 metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
 2206272223 metadata/md5-cache/net-misc/netkit-talk-0.17-r7
 2206272223 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
-2206281115 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
 2206281115 metadata/md5-cache/net-misc/netkit-timed-0.17-r10
 2206281115 metadata/md5-cache/net-misc/netopeer2-2.1.16
 2206291110 metadata/md5-cache/net-misc/netopeer2-2.1.23
@@ -53168,8 +53420,6 @@
 2206281115 metadata/md5-cache/net-misc/proxytunnel-1.10.20210128
 2206281115 metadata/md5-cache/net-misc/proxytunnel-1.10.20210604
 2206281115 metadata/md5-cache/net-misc/proxytunnel-9999
-2206281115 metadata/md5-cache/net-misc/putty-0.77
-2206281115 metadata/md5-cache/net-misc/putty-9999
 2206281115 metadata/md5-cache/net-misc/qtm-1.3.19-r1
 2206272223 metadata/md5-cache/net-misc/r8125-9.008.00
 2206272223 metadata/md5-cache/net-misc/r8125-9.009.01
@@ -53179,7 +53429,6 @@
 2206272223 metadata/md5-cache/net-misc/radvd-2.19-r2
 2206272223 metadata/md5-cache/net-misc/rclone-1.53.3
 2206272223 metadata/md5-cache/net-misc/rclone-1.57.0
-2206272223 metadata/md5-cache/net-misc/rclone-1.58.1
 2206272223 metadata/md5-cache/net-misc/rclone-9999
 2206281115 metadata/md5-cache/net-misc/remmina-1.4.25
 2206281115 metadata/md5-cache/net-misc/remmina-1.4.26
@@ -53370,8 +53619,6 @@
 2206292114 metadata/md5-cache/net-misc/pssh-2.3.4-r1
 2206291742 metadata/md5-cache/net-misc/ptpd-2.3.1-r1
 2206291742 metadata/md5-cache/net-misc/ptpd-2.3.1-r2
-2206292114 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
-2206291742 metadata/md5-cache/net-misc/putty-0.76
 2206292114 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
 2206292114 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
 2206292114 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
@@ -53407,8 +53654,6 @@
 2206291742 metadata/md5-cache/net-misc/sstp-client-1.0.17
 2206292114 metadata/md5-cache/net-misc/streamlink-1.3.1-r1
 2206292114 metadata/md5-cache/net-misc/streamlink-2.0.0
-2206292114 metadata/md5-cache/net-misc/streamlink-4.1.0-r2
-2206292114 metadata/md5-cache/net-misc/streamlink-9999
 2206291742 metadata/md5-cache/net-misc/taylor-uucp-1.07-r4
 2206291742 metadata/md5-cache/net-misc/telnet-bsd-1.2-r2
 2206291742 metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
@@ -53471,7 +53716,6 @@
 2207060440 metadata/md5-cache/net-misc/networkmanager-1.38.2
 2207060440 metadata/md5-cache/net-misc/rygel-0.40.4
 2207060940 metadata/md5-cache/net-misc/rsync-3.2.4-r3
-2207072040 metadata/md5-cache/net-misc/Manifest.gz
 2207062240 metadata/md5-cache/net-misc/gerbera-1.11.0
 2207062240 metadata/md5-cache/net-misc/gerbera-9999
 2207071940 metadata/md5-cache/net-misc/gns3-gui-2.2.33.1
@@ -53479,6 +53723,23 @@
 2207072040 metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
 2207072040 metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
 2207072040 metadata/md5-cache/net-misc/tigervnc-9999
+2207101610 metadata/md5-cache/net-misc/Manifest.gz
+2207101440 metadata/md5-cache/net-misc/felix-3.1.3
+2207101440 metadata/md5-cache/net-misc/keychain-2.8.5-r1
+2207092311 metadata/md5-cache/net-misc/mikutter-4.1.7
+2207092311 metadata/md5-cache/net-misc/mikutter-9999
+2207101540 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r13
+2207090440 metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.5_p1
+2207090440 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+2207101210 metadata/md5-cache/net-misc/putty-0.76
+2207101210 metadata/md5-cache/net-misc/putty-0.77-r1
+2207101210 metadata/md5-cache/net-misc/putty-9999
+2207091410 metadata/md5-cache/net-misc/r8125-9.009.02
+2207101540 metadata/md5-cache/net-misc/rclone-1.58.1
+2207101310 metadata/md5-cache/net-misc/rclone-1.59.0
+2207101610 metadata/md5-cache/net-misc/streamlink-4.1.0-r2
+2207101610 metadata/md5-cache/net-misc/streamlink-4.2.0
+2207101610 metadata/md5-cache/net-misc/streamlink-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203282310 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -53708,9 +53969,6 @@
 2206272223 metadata/md5-cache/net-proxy/squirm-1.26-r1
 2206291742 metadata/md5-cache/net-proxy/dante-1.4.1-r6
 2206292114 metadata/md5-cache/net-proxy/hatop-0.8.1
-2206292114 metadata/md5-cache/net-proxy/mitmproxy-7.0.4
-2206292114 metadata/md5-cache/net-proxy/mitmproxy-8.0.0
-2206292114 metadata/md5-cache/net-proxy/mitmproxy-8.1.0
 2206291742 metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
 2206291742 metadata/md5-cache/net-proxy/privoxy-3.0.33
 2206291742 metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
@@ -53729,8 +53987,10 @@
 2206291742 metadata/md5-cache/net-proxy/torsocks-2.4.0
 2206292114 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
 2206291742 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
-2207030040 metadata/md5-cache/net-proxy/Manifest.gz
 2207030040 metadata/md5-cache/net-proxy/havp-0.92a-r3
+2207101210 metadata/md5-cache/net-proxy/Manifest.gz
+2207100940 metadata/md5-cache/net-proxy/mitmproxy-8.1.0
+2207101210 metadata/md5-cache/net-proxy/mitmproxy-8.1.1
 2206291742 metadata/md5-cache/net-voip/captagent-6.3.1-r1
 2206300340 metadata/md5-cache/net-voip/murmur-1.3.3
 2206300340 metadata/md5-cache/net-voip/murmur-1.3.4
@@ -53821,11 +54081,11 @@
 2206291840 metadata/md5-cache/net-vpn/strongswan-5.9.6-r1
 2206292114 metadata/md5-cache/net-vpn/tor-0.4.6.10
 2206292114 metadata/md5-cache/net-vpn/tor-0.4.7.8
-2207041640 metadata/md5-cache/net-vpn/Manifest.gz
 2207041640 metadata/md5-cache/net-vpn/i2p-1.6.1
-2207041640 metadata/md5-cache/net-vpn/i2p-1.7.0
 2207030410 metadata/md5-cache/net-vpn/tinc-1.0.36
 2207030410 metadata/md5-cache/net-vpn/tinc-1.1_pre18
+2207100940 metadata/md5-cache/net-vpn/Manifest.gz
+2207100940 metadata/md5-cache/net-vpn/i2p-1.7.0
 2004041439 metadata/md5-cache/net-wireless/bluez-hcidump-2.5
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
@@ -53932,10 +54192,8 @@
 2206292114 metadata/md5-cache/net-wireless/blueman-2.2.3-r2
 2206292114 metadata/md5-cache/net-wireless/blueman-2.2.5
 2206292114 metadata/md5-cache/net-wireless/blueman-9999
-2206292114 metadata/md5-cache/net-wireless/bluez-5.64
 2206291742 metadata/md5-cache/net-wireless/bluez-tools-0_p20201025
 2206292114 metadata/md5-cache/net-wireless/crda-4.14
-2206292114 metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
 2206292114 metadata/md5-cache/net-wireless/gnuradio-3.8.5.0
 2206292114 metadata/md5-cache/net-wireless/gnuradio-3.8.5.0-r1
 2206292114 metadata/md5-cache/net-wireless/gnuradio-9999
@@ -53991,8 +54249,9 @@
 2207041640 metadata/md5-cache/net-wireless/unifi-7.1.66
 2207041640 metadata/md5-cache/net-wireless/unifi-7.1.67
 2207060440 metadata/md5-cache/net-wireless/gnome-bluetooth-42.1
-2207072140 metadata/md5-cache/net-wireless/Manifest.gz
 2207072140 metadata/md5-cache/net-wireless/gnome-bluetooth-42.2
+2207091810 metadata/md5-cache/net-wireless/Manifest.gz
+2207091810 metadata/md5-cache/net-wireless/bluez-5.64
 2207022141 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2207022141 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0
 2207022141 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
@@ -54240,7 +54499,6 @@
 2206192110 metadata/md5-cache/sci-biology/aaindex-9.1-r2
 2206192110 metadata/md5-cache/sci-biology/prints-39.0-r2
 2206192110 metadata/md5-cache/sci-biology/prosite-2017.02-r1
-2206192110 metadata/md5-cache/sci-biology/rebase-1901-r1
 2206221910 metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
 2206272223 metadata/md5-cache/sci-biology/STAR-2.7.10a
 2206272223 metadata/md5-cache/sci-biology/augustus-2.5.5
@@ -54321,8 +54579,6 @@
 2207022141 metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r2
 2207022141 metadata/md5-cache/sci-biology/bioperl-network-1.6.9-r1
 2207022141 metadata/md5-cache/sci-biology/bioperl-run-1.6.9-r1
-2207022141 metadata/md5-cache/sci-biology/trnascan-se-1.31
-2207030310 metadata/md5-cache/sci-biology/trnascan-se-1.31-r1
 2207022141 metadata/md5-cache/sci-biology/vcftools-0.1.16
 2207072310 metadata/md5-cache/sci-biology/amap-2.2-r5
 2207072310 metadata/md5-cache/sci-biology/biogrep-1.0-r3
@@ -54358,9 +54614,11 @@
 2207072310 metadata/md5-cache/sci-biology/transfac-3.2-r2
 2207072310 metadata/md5-cache/sci-biology/trf-4.04-r2
 2207072310 metadata/md5-cache/sci-biology/yass-1.14-r3
-2207081240 metadata/md5-cache/sci-biology/Manifest.gz
 2207081240 metadata/md5-cache/sci-biology/bedtools-2.30.0
 2207081240 metadata/md5-cache/sci-biology/biopandas-0.2.7
+2207091310 metadata/md5-cache/sci-biology/Manifest.gz
+2207090640 metadata/md5-cache/sci-biology/rebase-1901-r2
+2207091310 metadata/md5-cache/sci-biology/trnascan-se-1.31-r2
 2106222139 metadata/md5-cache/sci-calculators/datamash-1.7-r1
 2101022239 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
 2111280340 metadata/md5-cache/sci-calculators/bc-gh-5.2.1
@@ -54537,10 +54795,6 @@
 2206292114 metadata/md5-cache/sci-electronics/kicad-5.1.12-r3
 2206292114 metadata/md5-cache/sci-electronics/kicad-6.0.6
 2206292114 metadata/md5-cache/sci-electronics/kicad-9999
-2206292114 metadata/md5-cache/sci-electronics/klayout-0.27
-2206292114 metadata/md5-cache/sci-electronics/klayout-0.27.3
-2206292114 metadata/md5-cache/sci-electronics/klayout-0.27.7
-2206292114 metadata/md5-cache/sci-electronics/klayout-9999
 2206292114 metadata/md5-cache/sci-electronics/magic-8.3.309
 2206292114 metadata/md5-cache/sci-electronics/magic-8.3.309-r1
 2206291742 metadata/md5-cache/sci-electronics/ngspice-31-r1
@@ -54555,8 +54809,11 @@
 2206291742 metadata/md5-cache/sci-electronics/xcircuit-3.9.73
 2206291742 metadata/md5-cache/sci-electronics/xnec2c-4.4.11
 2206291742 metadata/md5-cache/sci-electronics/xoscope-2.2
-2207041640 metadata/md5-cache/sci-electronics/Manifest.gz
 2207041640 metadata/md5-cache/sci-electronics/electric-9.03
+2207092311 metadata/md5-cache/sci-electronics/Manifest.gz
+2207092311 metadata/md5-cache/sci-electronics/klayout-0.27.10
+2207092311 metadata/md5-cache/sci-electronics/klayout-0.27.7
+2207092311 metadata/md5-cache/sci-electronics/klayout-9999
 2105311239 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
@@ -54899,7 +55156,6 @@
 2206281115 metadata/md5-cache/sci-libs/proj-9.0.1
 2206272223 metadata/md5-cache/sci-libs/qd-2.3.23
 2206281115 metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
-2206281115 metadata/md5-cache/sci-libs/rocBLAS-5.0.2
 2206281115 metadata/md5-cache/sci-libs/rocFFT-4.0.0-r1
 2206281115 metadata/md5-cache/sci-libs/rocPRIM-4.0.0-r1
 2206281115 metadata/md5-cache/sci-libs/rocPRIM-4.3.0-r2
@@ -55025,7 +55281,6 @@
 2206291742 metadata/md5-cache/sci-libs/netcdf-fortran-4.5.3
 2206291742 metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4
 2206292114 metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
-2206292114 metadata/md5-cache/sci-libs/nlopt-2.7.1
 2206292114 metadata/md5-cache/sci-libs/numkit-1.1.2-r1
 2206302240 metadata/md5-cache/sci-libs/ogdi-4.1.0-r1
 2206292114 metadata/md5-cache/sci-libs/onnx-1.11.0-r1
@@ -55036,8 +55291,6 @@
 2206292114 metadata/md5-cache/sci-libs/pyshp-2.1.3
 2206292114 metadata/md5-cache/sci-libs/rocBLAS-4.3.0
 2206292114 metadata/md5-cache/sci-libs/rocBLAS-4.3.0-r1
-2206292114 metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
-2206292114 metadata/md5-cache/sci-libs/rocFFT-5.0.2
 2206292114 metadata/md5-cache/sci-libs/rocSPARSE-4.3.0-r3
 2206292114 metadata/md5-cache/sci-libs/rocSPARSE-5.0.2
 2206292114 metadata/md5-cache/sci-libs/rtree-0.9.7
@@ -55077,12 +55330,7 @@
 2207041640 metadata/md5-cache/sci-libs/gdal-3.5.0-r4
 2207022340 metadata/md5-cache/sci-libs/geos-3.11.0
 2207052010 metadata/md5-cache/sci-libs/hdf5-1.12.2-r4
-2207041640 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
-2207041640 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
-2207041640 metadata/md5-cache/sci-libs/libsigrok-9999
 2207041640 metadata/md5-cache/sci-libs/libsvm-3.25-r1
-2207022141 metadata/md5-cache/sci-libs/linux-gpib-4.3.4
-2207022141 metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
 2207031240 metadata/md5-cache/sci-libs/med-4.1.1
 2207041640 metadata/md5-cache/sci-libs/plplot-5.15.0-r103
 2207050940 metadata/md5-cache/sci-libs/pytorch-1.11.0
@@ -55091,11 +55339,20 @@
 2207041640 metadata/md5-cache/sci-libs/vtk-9.0.3-r5
 2207041640 metadata/md5-cache/sci-libs/vtk-9.1.0-r2
 2207060840 metadata/md5-cache/sci-libs/lmfit-9.0-r1
-2207071340 metadata/md5-cache/sci-libs/Manifest.gz
 2207071340 metadata/md5-cache/sci-libs/ViSP-3.5.0
 2207062010 metadata/md5-cache/sci-libs/dlib-19.24
 2207071340 metadata/md5-cache/sci-libs/octomap-1.9.8
 2207070940 metadata/md5-cache/sci-libs/sundials-6.2.0
+2207101110 metadata/md5-cache/sci-libs/Manifest.gz
+2207090910 metadata/md5-cache/sci-libs/gdal-3.5.1
+2207092311 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
+2207092311 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
+2207092311 metadata/md5-cache/sci-libs/libsigrok-9999
+2207101110 metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
+2207091540 metadata/md5-cache/sci-libs/nlopt-2.7.1
+2207082040 metadata/md5-cache/sci-libs/rocBLAS-5.0.2-r1
+2207090940 metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
+2207090940 metadata/md5-cache/sci-libs/rocFFT-5.0.2
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2101061839 metadata/md5-cache/sci-mathematics/lrcalc-1.2
@@ -56399,7 +56656,6 @@
 2002100339 metadata/md5-cache/sys-apps/gscanbus-0.8
 1708111209 metadata/md5-cache/sys-apps/hprofile-6.1.3
 2012311940 metadata/md5-cache/sys-apps/ifplugd-0.28-r11
-2012311940 metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
 2111060814 metadata/md5-cache/sys-apps/input-utils-1.3
 2012161439 metadata/md5-cache/sys-apps/inxi-3.1.06.1
 2105151909 metadata/md5-cache/sys-apps/inxi-3.3.04.1
@@ -56637,7 +56893,6 @@
 2206272223 metadata/md5-cache/sys-apps/s6-linux-utils-2.6.0.0
 2206272223 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0-r1
 2206272223 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.5.0
-2206272223 metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
 2206272223 metadata/md5-cache/sys-apps/s6-rc-0.5.3.1-r1
 2206272223 metadata/md5-cache/sys-apps/s6-rc-0.5.3.2
 2206272223 metadata/md5-cache/sys-apps/salinfo-1.2
@@ -56779,8 +57034,6 @@
 2206291742 metadata/md5-cache/sys-apps/man-db-9999
 2206291742 metadata/md5-cache/sys-apps/miller-5.10.2
 2206291742 metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
-2206292114 metadata/md5-cache/sys-apps/onerng-3.6-r4
-2206292114 metadata/md5-cache/sys-apps/onerng-3.7
 2206292114 metadata/md5-cache/sys-apps/opal-utils-6.8
 2206292114 metadata/md5-cache/sys-apps/opal-utils-7.0
 2206292114 metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
@@ -56896,8 +57149,11 @@
 2207060440 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0
 2207070640 metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
 2207072240 metadata/md5-cache/sys-apps/systemd-251.2
-2207081340 metadata/md5-cache/sys-apps/Manifest.gz
 2207081340 metadata/md5-cache/sys-apps/toybox-0.8.7
+2207101110 metadata/md5-cache/sys-apps/Manifest.gz
+2207091140 metadata/md5-cache/sys-apps/hdparm-9.64
+2207090910 metadata/md5-cache/sys-apps/hwloc-2.8.0
+2207100040 metadata/md5-cache/sys-apps/onerng-3.7
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -57270,7 +57526,6 @@
 2206292114 metadata/md5-cache/sys-cluster/glusterfs-9.4-r1
 2206292114 metadata/md5-cache/sys-cluster/glusterfs-9.5-r1
 2206291742 metadata/md5-cache/sys-cluster/hpl-2.3
-2206292114 metadata/md5-cache/sys-cluster/hpx-1.8.0
 2206292114 metadata/md5-cache/sys-cluster/hpx-9999
 2206291742 metadata/md5-cache/sys-cluster/keepalived-2.2.4
 2206291742 metadata/md5-cache/sys-cluster/keepalived-2.2.7
@@ -57306,8 +57561,6 @@
 2207020410 metadata/md5-cache/sys-cluster/k3s-1.24.2_p1
 2207041640 metadata/md5-cache/sys-cluster/openmpi-4.1.2
 2207041640 metadata/md5-cache/sys-cluster/openmpi-4.1.4
-2207022141 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104
-2207022141 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105
 2207041640 metadata/md5-cache/sys-cluster/spark-bin-2.4.3
 2207041640 metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
 2207041640 metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
@@ -57315,10 +57568,13 @@
 2207041640 metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
 2207041640 metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
 2207072140 metadata/md5-cache/sys-cluster/ceph-16.2.9
-2207080410 metadata/md5-cache/sys-cluster/galera-25.3.28-r2
 2207080410 metadata/md5-cache/sys-cluster/galera-26.4.10-r1
-2207081010 metadata/md5-cache/sys-cluster/Manifest.gz
 2207081010 metadata/md5-cache/sys-cluster/galera-26.4.8-r1
+2207091210 metadata/md5-cache/sys-cluster/Manifest.gz
+2207090110 metadata/md5-cache/sys-cluster/galera-25.3.28-r2
+2207090810 metadata/md5-cache/sys-cluster/hpx-1.8.0
+2207091210 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r104
+2207091210 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r105
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
 2109100910 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
@@ -57374,11 +57630,8 @@
 2206281115 metadata/md5-cache/sys-devel/binutils-2.35.2
 2206281115 metadata/md5-cache/sys-devel/binutils-2.36.1-r2
 2206281115 metadata/md5-cache/sys-devel/binutils-2.37_p1-r2
-2206281115 metadata/md5-cache/sys-devel/binutils-2.37_p1-r3
 2206281115 metadata/md5-cache/sys-devel/binutils-2.38-r1
 2206281115 metadata/md5-cache/sys-devel/binutils-2.38-r2
-2206281115 metadata/md5-cache/sys-devel/binutils-2.38-r3
-2206281115 metadata/md5-cache/sys-devel/binutils-9999
 2206281115 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2206281115 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 2206281115 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101
@@ -57500,7 +57753,6 @@
 2206292114 metadata/md5-cache/sys-devel/llvm-14.0.5
 2206292114 metadata/md5-cache/sys-devel/llvm-14.0.6
 2206292114 metadata/md5-cache/sys-devel/llvm-15.0.0.9999
-2207041640 metadata/md5-cache/sys-devel/Manifest.gz
 2207021440 metadata/md5-cache/sys-devel/bmake-20220612
 2207030540 metadata/md5-cache/sys-devel/gcc-10.4.0
 2207030540 metadata/md5-cache/sys-devel/gcc-10.4.1_p20220630
@@ -57511,6 +57763,12 @@
 2207041640 metadata/md5-cache/sys-devel/gettext-0.21-r3
 2207030240 metadata/md5-cache/sys-devel/mold-1.3.1
 2207012240 metadata/md5-cache/sys-devel/rust-std-1.59.0
+2207101440 metadata/md5-cache/sys-devel/Manifest.gz
+2207091510 metadata/md5-cache/sys-devel/binutils-9999
+2207090710 metadata/md5-cache/sys-devel/crossdev-20220709
+2207101440 metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707
+2207101440 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708
+2207101440 metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709
 2206291742 metadata/md5-cache/sys-fabric/Manifest.gz
 2206291742 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2206291742 metadata/md5-cache/sys-fabric/mstflint-4.20.0_p1
@@ -57795,7 +58053,6 @@
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
 2203240726 metadata/md5-cache/sys-kernel/linux-next-9999
 2203240726 metadata/md5-cache/sys-kernel/raspberrypi-image-9999
-2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210629
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210716
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210818
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210919
@@ -57896,7 +58153,6 @@
 2206291610 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.8
 2206291610 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.202
 2206292114 metadata/md5-cache/sys-kernel/kergen-0.1.5
-2206292114 metadata/md5-cache/sys-kernel/linux-docs-5.15.33
 2206291810 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
 2207051740 metadata/md5-cache/sys-kernel/dracut-057-r1
 2207050240 metadata/md5-cache/sys-kernel/dracut-9999
@@ -57905,13 +58161,7 @@
 2207040810 metadata/md5-cache/sys-kernel/genkernel-9999
 2207040310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.9
 2207031110 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.9
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52
 2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.9
-2207022240 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
 2207040240 metadata/md5-cache/sys-kernel/git-sources-5.19_rc5
 2207040940 metadata/md5-cache/sys-kernel/pf-sources-5.18_p3
 2207040910 metadata/md5-cache/sys-kernel/rt-sources-5.15.49_p47
@@ -57935,7 +58185,6 @@
 2207071940 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.53
 2207071940 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.10
 2207071940 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.204
-2207081340 metadata/md5-cache/sys-kernel/Manifest.gz
 2207081340 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.128
 2207081340 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.129
 2207081340 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.52
@@ -57954,6 +58203,15 @@
 2207081340 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.53
 2207081340 metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.10
 2207081340 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.204
+2207091540 metadata/md5-cache/sys-kernel/Manifest.gz
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.128
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.52
+2207091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
+2207082040 metadata/md5-cache/sys-kernel/linux-docs-5.15.53
+2207082040 metadata/md5-cache/sys-kernel/linux-firmware-20220708
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -58540,8 +58798,6 @@
 2206272223 metadata/md5-cache/virtual/krb5-0-r1
 2206272223 metadata/md5-cache/virtual/libcrypt-1-r1
 2206272223 metadata/md5-cache/virtual/libcrypt-2
-2206272223 metadata/md5-cache/virtual/libelf-2
-2206272223 metadata/md5-cache/virtual/libelf-3
 2206272223 metadata/md5-cache/virtual/libiconv-0-r2
 2206272223 metadata/md5-cache/virtual/libintl-0-r2
 2206272223 metadata/md5-cache/virtual/libudev-232-r5
@@ -58553,11 +58809,6 @@
 2206272223 metadata/md5-cache/virtual/opencl-3-r1
 2206272223 metadata/md5-cache/virtual/opengl-7.0-r2
 2206281610 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.202.0
-2206272223 metadata/md5-cache/virtual/ruby-ssl-11
-2206272223 metadata/md5-cache/virtual/ruby-ssl-12
-2206272223 metadata/md5-cache/virtual/rubygems-15
-2206272223 metadata/md5-cache/virtual/rubygems-16
-2206272223 metadata/md5-cache/virtual/rubygems-17
 2206272223 metadata/md5-cache/virtual/rust-1.59.0
 2206272223 metadata/md5-cache/virtual/rust-1.60.0
 2206272223 metadata/md5-cache/virtual/rust-1.61.0
@@ -58566,7 +58817,6 @@
 2206292114 metadata/md5-cache/virtual/python-greenlet-1.0-r2
 2207031110 metadata/md5-cache/virtual/dist-kernel-5.18.9
 2207012240 metadata/md5-cache/virtual/rust-1.62.0
-2207081340 metadata/md5-cache/virtual/Manifest.gz
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.10.128
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.10.129
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.15.52
@@ -58574,6 +58824,14 @@
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.18.10
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.4.203
 2207081340 metadata/md5-cache/virtual/dist-kernel-5.4.204
+2207101110 metadata/md5-cache/virtual/Manifest.gz
+2207101110 metadata/md5-cache/virtual/libelf-2-r1
+2207101110 metadata/md5-cache/virtual/libelf-3-r1
+2207092311 metadata/md5-cache/virtual/ruby-ssl-11
+2207092311 metadata/md5-cache/virtual/ruby-ssl-12
+2207092311 metadata/md5-cache/virtual/rubygems-15
+2207092311 metadata/md5-cache/virtual/rubygems-16
+2207092311 metadata/md5-cache/virtual/rubygems-17
 2112220410 metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
 2203240726 metadata/md5-cache/www-apache/mod_auth_radius-1.6.0
 2203240726 metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r2
@@ -58601,8 +58859,6 @@
 2206281115 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
 2206272223 metadata/md5-cache/www-apache/mod_backtrace-2.01-r2
 2206281740 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r2
-2206281115 metadata/md5-cache/www-apache/passenger-6.0.11
-2206281115 metadata/md5-cache/www-apache/passenger-6.0.14
 2206281115 metadata/md5-cache/www-apache/pwauth-2.3.10-r1
 2206291742 metadata/md5-cache/www-apache/mod_auth_xradius-0.4.6-r1
 2206292114 metadata/md5-cache/www-apache/mod_gnutls-0.11.0
@@ -58621,10 +58877,12 @@
 2206291742 metadata/md5-cache/www-apache/mod_security-2.9.5-r1
 2206292114 metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
 2206292114 metadata/md5-cache/www-apache/mod_wsgi-4.9.0
-2207051040 metadata/md5-cache/www-apache/Manifest.gz
 2207030110 metadata/md5-cache/www-apache/libapreq2-2.16-r1
 2207051040 metadata/md5-cache/www-apache/mod_gnutls-0.12.0-r1
 2207022141 metadata/md5-cache/www-apache/mod_perl-2.0.11-r1
+2207092311 metadata/md5-cache/www-apache/Manifest.gz
+2207092311 metadata/md5-cache/www-apache/passenger-6.0.11
+2207092311 metadata/md5-cache/www-apache/passenger-6.0.14
 2108080310 metadata/md5-cache/www-apps/airdcpp-webui-2.11.0
 2108031309 metadata/md5-cache/www-apps/airdcpp-webui-2.11.1
 2110011509 metadata/md5-cache/www-apps/airdcpp-webui-2.11.2
@@ -58691,42 +58949,18 @@
 2206272223 metadata/md5-cache/www-apps/icingaweb2-2.10.2
 2206272223 metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.1
 2206272223 metadata/md5-cache/www-apps/icingaweb2-module-director-9999
-2206272223 metadata/md5-cache/www-apps/jekyll-4.2.2
-2206272223 metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
-2206272223 metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
-2206272223 metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
-2206272223 metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
 2206272223 metadata/md5-cache/www-apps/kibana-bin-7.17.3
 2206272223 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
 2206272223 metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
 2206272223 metadata/md5-cache/www-apps/liquid_feedback_core-3.2.2
 2206272223 metadata/md5-cache/www-apps/miniflux-2.0.37
 2206272223 metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
-2206272223 metadata/md5-cache/www-apps/nanoc-4.12.2
-2206272223 metadata/md5-cache/www-apps/nanoc-4.12.3
-2206272223 metadata/md5-cache/www-apps/nanoc-4.12.5
-2206272223 metadata/md5-cache/www-apps/nanoc-4.12.6
-2206272223 metadata/md5-cache/www-apps/nanoc-checking-1.0.1
-2206272223 metadata/md5-cache/www-apps/nanoc-checking-1.0.2
-2206272223 metadata/md5-cache/www-apps/nanoc-cli-4.12.2
-2206272223 metadata/md5-cache/www-apps/nanoc-cli-4.12.3
-2206272223 metadata/md5-cache/www-apps/nanoc-cli-4.12.5
-2206272223 metadata/md5-cache/www-apps/nanoc-cli-4.12.6
-2206272223 metadata/md5-cache/www-apps/nanoc-core-4.12.2
-2206272223 metadata/md5-cache/www-apps/nanoc-core-4.12.3
-2206272223 metadata/md5-cache/www-apps/nanoc-core-4.12.5
-2206272223 metadata/md5-cache/www-apps/nanoc-core-4.12.6
-2206272223 metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
-2206272223 metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
-2206272223 metadata/md5-cache/www-apps/nanoc-spec-0.0.2
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.1.7
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.0
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.1
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.2
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.4
 2206272223 metadata/md5-cache/www-apps/nextcloud-notify_push-0.3.0
-2206272223 metadata/md5-cache/www-apps/redmine-4.1.5
-2206272223 metadata/md5-cache/www-apps/redmine-4.2.3
 2206272223 metadata/md5-cache/www-apps/trickster-1.1.5
 2206272223 metadata/md5-cache/www-apps/webdavcgi-1.1.2
 2206272223 metadata/md5-cache/www-apps/webmcp-1.2.6-r1
@@ -58760,11 +58994,40 @@
 2207012310 metadata/md5-cache/www-apps/piwigo-12.3.0
 2207041640 metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1
 2207060940 metadata/md5-cache/www-apps/xpra-html5-5.0
-2207071910 metadata/md5-cache/www-apps/Manifest.gz
 2207071910 metadata/md5-cache/www-apps/icingaweb2-2.11.1
 2207071910 metadata/md5-cache/www-apps/icingaweb2-module-director-1.9.1
 2207071910 metadata/md5-cache/www-apps/icingaweb2-module-incubator-0.17.0
 2207071810 metadata/md5-cache/www-apps/phpBB-3.3.8
+2207100940 metadata/md5-cache/www-apps/Manifest.gz
+2207091440 metadata/md5-cache/www-apps/element-1.11.0
+2207092311 metadata/md5-cache/www-apps/jekyll-4.2.2
+2207092311 metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
+2207092311 metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
+2207092311 metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
+2207092311 metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
+2207082110 metadata/md5-cache/www-apps/mediawiki-1.37.4
+2207092311 metadata/md5-cache/www-apps/nanoc-4.12.2
+2207092311 metadata/md5-cache/www-apps/nanoc-4.12.3
+2207092311 metadata/md5-cache/www-apps/nanoc-4.12.5
+2207092311 metadata/md5-cache/www-apps/nanoc-4.12.6
+2207100940 metadata/md5-cache/www-apps/nanoc-4.12.7
+2207092311 metadata/md5-cache/www-apps/nanoc-checking-1.0.1
+2207092311 metadata/md5-cache/www-apps/nanoc-checking-1.0.2
+2207092311 metadata/md5-cache/www-apps/nanoc-cli-4.12.2
+2207092311 metadata/md5-cache/www-apps/nanoc-cli-4.12.3
+2207092311 metadata/md5-cache/www-apps/nanoc-cli-4.12.5
+2207092311 metadata/md5-cache/www-apps/nanoc-cli-4.12.6
+2207100940 metadata/md5-cache/www-apps/nanoc-cli-4.12.7
+2207092311 metadata/md5-cache/www-apps/nanoc-core-4.12.2
+2207092311 metadata/md5-cache/www-apps/nanoc-core-4.12.3
+2207092311 metadata/md5-cache/www-apps/nanoc-core-4.12.5
+2207092311 metadata/md5-cache/www-apps/nanoc-core-4.12.6
+2207100940 metadata/md5-cache/www-apps/nanoc-core-4.12.7
+2207092311 metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
+2207092311 metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
+2207092311 metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+2207092311 metadata/md5-cache/www-apps/redmine-4.1.5
+2207092311 metadata/md5-cache/www-apps/redmine-4.2.3
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2104121139 metadata/md5-cache/www-client/fetch-1.0-r4
 2107180040 metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
@@ -58836,8 +59099,9 @@
 2207071410 metadata/md5-cache/www-client/falkon-22.04.3
 2207070810 metadata/md5-cache/www-client/qutebrowser-2.5.2
 2207070110 metadata/md5-cache/www-client/vivaldi-5.3.2679.68
-2207081140 metadata/md5-cache/www-client/Manifest.gz
 2207081140 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2729.2
+2207092311 metadata/md5-cache/www-client/Manifest.gz
+2207092311 metadata/md5-cache/www-client/epiphany-42.3
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -58877,7 +59141,6 @@
 2207040210 metadata/md5-cache/www-plugins/Manifest.gz
 2207040210 metadata/md5-cache/www-plugins/pdfjs-2.14.305
 2012311940 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
-2206272223 metadata/md5-cache/www-servers/adsf-1.4.6-r1
 2206272223 metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2
 2206272223 metadata/md5-cache/www-servers/caddy-2.5.1
 2206281115 metadata/md5-cache/www-servers/civetweb-1.12
@@ -58891,13 +59154,7 @@
 2206272223 metadata/md5-cache/www-servers/moonbridge-1.0.1
 2206281115 metadata/md5-cache/www-servers/pound-3.0
 2206281115 metadata/md5-cache/www-servers/pound-3.0.2
-2206272223 metadata/md5-cache/www-servers/puma-5.6.4
-2206272223 metadata/md5-cache/www-servers/thin-1.8.1
 2206272223 metadata/md5-cache/www-servers/webfs-1.21
-2206291742 metadata/md5-cache/www-servers/apache-2.4.53
-2206291742 metadata/md5-cache/www-servers/apache-2.4.53-r1
-2206291742 metadata/md5-cache/www-servers/apache-2.4.54
-2206291742 metadata/md5-cache/www-servers/apache-2.4.54-r1
 2206292114 metadata/md5-cache/www-servers/gunicorn-20.1.0-r1
 2206291742 metadata/md5-cache/www-servers/lighttpd-1.4.55-r102
 2206291742 metadata/md5-cache/www-servers/lighttpd-1.4.58-r2
@@ -58912,31 +59169,30 @@
 2206291742 metadata/md5-cache/www-servers/thttpd-9999
 2206292114 metadata/md5-cache/www-servers/tornado-6.1
 2206292114 metadata/md5-cache/www-servers/tornado-6.1-r1
-2206292114 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
 2206292114 metadata/md5-cache/www-servers/varnish-6.5.2
 2206292114 metadata/md5-cache/www-servers/varnish-6.6.1
 2206292114 metadata/md5-cache/www-servers/varnish-7.0.1
 2206292114 metadata/md5-cache/www-servers/varnish-7.1.0
 2206291742 metadata/md5-cache/www-servers/xsp-3.8_p2014120900-r1
 2206291742 metadata/md5-cache/www-servers/xsp-4.7.1-r1
-2207041640 metadata/md5-cache/www-servers/Manifest.gz
-2207022141 metadata/md5-cache/www-servers/nginx-1.20.1-r3
-2207022141 metadata/md5-cache/www-servers/nginx-1.20.2-r1
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.0-r3
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.1-r1
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.2-r1
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.3-r1
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.4-r1
-2207022141 metadata/md5-cache/www-servers/nginx-1.21.6-r1
 2207022141 metadata/md5-cache/www-servers/pshs-0.4.1
 2207041640 metadata/md5-cache/www-servers/tomcat-10.0.21
-2207041640 metadata/md5-cache/www-servers/tomcat-10.0.22
 2207041640 metadata/md5-cache/www-servers/tomcat-7.0.109-r1
 2207041640 metadata/md5-cache/www-servers/tomcat-8.5.79
-2207041640 metadata/md5-cache/www-servers/tomcat-8.5.81
 2207041640 metadata/md5-cache/www-servers/tomcat-9.0.63
-2207041640 metadata/md5-cache/www-servers/tomcat-9.0.64
 2207040840 metadata/md5-cache/www-servers/tornado-6.2
+2207101540 metadata/md5-cache/www-servers/Manifest.gz
+2207092311 metadata/md5-cache/www-servers/adsf-1.4.6-r1
+2207100040 metadata/md5-cache/www-servers/apache-2.4.54-r2
+2207100040 metadata/md5-cache/www-servers/apache-2.4.54-r3
+2207100040 metadata/md5-cache/www-servers/nginx-1.21.6-r2
+2207081940 metadata/md5-cache/www-servers/nginx-unit-1.27.0
+2207092311 metadata/md5-cache/www-servers/puma-5.6.4
+2207092311 metadata/md5-cache/www-servers/thin-1.8.1
+2207101540 metadata/md5-cache/www-servers/tomcat-10.0.22
+2207101540 metadata/md5-cache/www-servers/tomcat-8.5.81
+2207101540 metadata/md5-cache/www-servers/tomcat-9.0.64
+2207092311 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
 2112190440 metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
 2205100440 metadata/md5-cache/x11-apps/luit-20220111
 2206272223 metadata/md5-cache/x11-apps/radeon-profile-20200824
@@ -59139,7 +59395,6 @@
 2206281115 metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
 2206281115 metadata/md5-cache/x11-libs/tslib-1.22
 2206272223 metadata/md5-cache/x11-libs/vte-0.28.2-r209
-2206272223 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
 2206272223 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302
 2206272223 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r303
 2206291742 metadata/md5-cache/x11-libs/agg-2.5-r3
@@ -59254,8 +59509,10 @@
 2207022141 metadata/md5-cache/x11-libs/xapp-2.2.8
 2207060440 metadata/md5-cache/x11-libs/libnotify-0.7.12
 2207060940 metadata/md5-cache/x11-libs/libfakeXinerama-0.1.0
-2207072340 metadata/md5-cache/x11-libs/Manifest.gz
-2207072340 metadata/md5-cache/x11-libs/wxGTK-3.0.5.1
+2207100310 metadata/md5-cache/x11-libs/Manifest.gz
+2207100310 metadata/md5-cache/x11-libs/libdrm-2.4.112
+2207100210 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r3
+2207091540 metadata/md5-cache/x11-libs/wxGTK-3.0.5.1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -59500,8 +59757,6 @@
 2206291742 metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
 2206291742 metadata/md5-cache/x11-misc/bbtime-0.1.5-r2
 2206291742 metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
-2206291742 metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
-2206291742 metadata/md5-cache/x11-misc/bumblebee-9999
 2206291742 metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
 2206291742 metadata/md5-cache/x11-misc/compose-tables-1.7.5
 2206291742 metadata/md5-cache/x11-misc/compose-tables-1.8.1
@@ -59652,8 +59907,10 @@
 2207022141 metadata/md5-cache/x11-misc/xkeyboard-config-9999
 2207060440 metadata/md5-cache/x11-misc/alacarte-3.44.2
 2207060340 metadata/md5-cache/x11-misc/polybar-3.6.3
-2207070540 metadata/md5-cache/x11-misc/Manifest.gz
 2207070540 metadata/md5-cache/x11-misc/vdpauinfo-1.5
+2207091810 metadata/md5-cache/x11-misc/Manifest.gz
+2207091810 metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
+2207091810 metadata/md5-cache/x11-misc/bumblebee-9999
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -59676,17 +59933,14 @@
 2012171539 metadata/md5-cache/x11-plugins/wmbattery-2.54
 2012171539 metadata/md5-cache/x11-plugins/wmbutton-0.7.1
 1809192109 metadata/md5-cache/x11-plugins/wmcalc-0.7
-2003291839 metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
 1807262339 metadata/md5-cache/x11-plugins/wmdiskmon-0.0.2-r1
 2012231444 metadata/md5-cache/x11-plugins/wmgtemp-1.2
-2012171539 metadata/md5-cache/x11-plugins/wmix-3.5
 1907151840 metadata/md5-cache/x11-plugins/wmlongrun-0.3.1
 1805220439 metadata/md5-cache/x11-plugins/wmmixer-1.8
 2103092239 metadata/md5-cache/x11-plugins/wmmixer-1.9
 1903080309 metadata/md5-cache/x11-plugins/wmmon-1.4
 2005031339 metadata/md5-cache/x11-plugins/wmmoonclock-1.30
 2006151909 metadata/md5-cache/x11-plugins/wmnd-0.4.18
-1809152339 metadata/md5-cache/x11-plugins/wmpager-1.2-r2
 2002030239 metadata/md5-cache/x11-plugins/wmping-0.2.1-r1
 2002250109 metadata/md5-cache/x11-plugins/wmweather+-2.17
 2001292139 metadata/md5-cache/x11-plugins/wmwork-0.2.5-r1
@@ -59695,10 +59949,8 @@
 2202150840 metadata/md5-cache/x11-plugins/wmmp-0.10.0-r1
 2202201909 metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r3
 2203040410 metadata/md5-cache/x11-plugins/wmappl-0.71-r1
-2203040410 metadata/md5-cache/x11-plugins/wmbio-1.02
 2203040410 metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
 2203040410 metadata/md5-cache/x11-plugins/wmcpuload-1.1.1
-2203040410 metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
 2203040410 metadata/md5-cache/x11-plugins/wmifs-1.8
 2203040410 metadata/md5-cache/x11-plugins/wmmoonclock-1.29
 2203040410 metadata/md5-cache/x11-plugins/wmmp3-0.12-r1
@@ -59709,7 +59961,6 @@
 2203240726 metadata/md5-cache/x11-plugins/pidgin-funyahoo-plusplus-9999
 2206110110 metadata/md5-cache/x11-plugins/wmbattery-2.56
 2206191210 metadata/md5-cache/x11-plugins/pidgin-otr-4.0.2-r1
-2206221910 metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
 2206272223 metadata/md5-cache/x11-plugins/allin1-0.5.0-r2
 2206272223 metadata/md5-cache/x11-plugins/asclock-2.0.12-r3
 2206272223 metadata/md5-cache/x11-plugins/asclock-2.0.12-r4
@@ -59729,7 +59980,6 @@
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r3
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
-2206272223 metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r2
 2206272223 metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
@@ -59817,7 +60067,6 @@
 2206272223 metadata/md5-cache/x11-plugins/wmnet-1.06-r2
 2206272223 metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
 2206272223 metadata/md5-cache/x11-plugins/wmppp-1.3.2-r2
-2206272223 metadata/md5-cache/x11-plugins/wmrack-1.4-r1
 2206272223 metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2
 2206272223 metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
 2206281115 metadata/md5-cache/x11-plugins/wmswallow-0.6.1-r1
@@ -59842,7 +60091,6 @@
 2206291510 metadata/md5-cache/x11-plugins/vicious-2.5.1
 2206291742 metadata/md5-cache/x11-plugins/wmbiff-0.4.36
 2206291742 metadata/md5-cache/x11-plugins/wmblob-1.0.4
-2206291742 metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
 2206291742 metadata/md5-cache/x11-plugins/wmclock-1.0.16-r1
 2206291742 metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
 2206291742 metadata/md5-cache/x11-plugins/wmforkplop-0.9.3-r3
@@ -59858,8 +60106,17 @@
 2206291742 metadata/md5-cache/x11-plugins/wmsystemtray-1.4-r2
 2206291742 metadata/md5-cache/x11-plugins/wmtop-0.85
 2206291742 metadata/md5-cache/x11-plugins/wmweather+-2.18
-2207080040 metadata/md5-cache/x11-plugins/Manifest.gz
 2207080040 metadata/md5-cache/x11-plugins/wmcp-1.2.8-r2
+2207101740 metadata/md5-cache/x11-plugins/Manifest.gz
+2207090640 metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
+2207091910 metadata/md5-cache/x11-plugins/wmbio-1.02
+2207091910 metadata/md5-cache/x11-plugins/wmcdplay-1.1-r1
+2207091910 metadata/md5-cache/x11-plugins/wmcms-0.3.5-r4
+2207091910 metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
+2207091910 metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
+2207101740 metadata/md5-cache/x11-plugins/wmix-3.5
+2207091910 metadata/md5-cache/x11-plugins/wmpager-1.2-r2
+2207101710 metadata/md5-cache/x11-plugins/wmrack-1.4-r1
 2201091240 metadata/md5-cache/x11-terms/st-terminfo-0.8.5
 2203240726 metadata/md5-cache/x11-terms/kitty-terminfo-9999
 2203240726 metadata/md5-cache/x11-terms/st-terminfo-9999
@@ -60117,7 +60374,6 @@
 2206272223 metadata/md5-cache/x11-wm/spectrwm-3.4.1
 2206272223 metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
 2206272223 metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
-2206272223 metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
 2206272223 metadata/md5-cache/x11-wm/treewm-0.4.5-r2
 2206272223 metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
 2206272223 metadata/md5-cache/x11-wm/windowlab-1.40-r1
@@ -60171,8 +60427,9 @@
 2207050210 metadata/md5-cache/x11-wm/mutter-42.3
 2207040010 metadata/md5-cache/x11-wm/page-1.9.9-r4
 2207060440 metadata/md5-cache/x11-wm/mutter-42.2
-2207060940 metadata/md5-cache/x11-wm/Manifest.gz
 2207060940 metadata/md5-cache/x11-wm/xpra-4.3.3
+2207092311 metadata/md5-cache/x11-wm/Manifest.gz
+2207092311 metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
 2107251109 metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
 2203240726 metadata/md5-cache/xfce-base/garcon-0.8.0
 2203240726 metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
@@ -60194,8 +60451,10 @@
 2206272223 metadata/md5-cache/xfce-base/xfconf-4.16.0
 2206292114 metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
 2207051740 metadata/md5-cache/xfce-base/xfce4-settings-4.16.3
-2207052210 metadata/md5-cache/xfce-base/Manifest.gz
 2207052110 metadata/md5-cache/xfce-base/exo-4.16.4
+2207101440 metadata/md5-cache/xfce-base/Manifest.gz
+2207092340 metadata/md5-cache/xfce-base/thunar-4.17.9
+2207101440 metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
 2111190939 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 2111190939 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
 2111190939 metadata/md5-cache/xfce-extra/transd-0_p20120503-r1
@@ -60428,4 +60687,4 @@
 2206111440 metadata/md5-cache/sec-keys/openpgp-keys-llvm-14
 2206220110 metadata/md5-cache/sec-keys/Manifest.gz
 2206220110 metadata/md5-cache/sec-keys/openpgp-keys-libidn-20220621
-2207081440 metadata/md5-cache/Manifest.gz
+2207101740 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1dd4f552a25f..70b23ed2bf0d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2022 12:00:01 +0000
+Sun, 10 Jul 2022 15:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 650f8e2c36c2..8292a0a709c0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-46a7b2acad0b8650e9a285cce9795c4f24720230 1657279083 2022-07-08T11:18:03+00:00
+22062140738c4b1b3f8ae534777f097d37b49ddc 1657462071 2022-07-10T14:07:51+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 35a8c33bbc20..ee593baac4bb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657280401 Fri 08 Jul 2022 11:40:01 AM UTC
+1657464001 Sun 10 Jul 2022 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 65efe0a843e5..e22246fad78d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2022 11:39:40 +0000
+Sun, 10 Jul 2022 14:39:44 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0eb154ae2de5..a89b87dc6778 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 9b51127e2326..33a849b3b66a 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,7 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.4-r1.ebuild 967 BLAKE2B 4edc8e62bd917b2ab07b025dc1fd1bc2915f8b0c99c392e79c5bea64099f30f00ddbbcf84fb0d740d574867f10ef1b14318efa415510ef2d1defb993bb36b0e4 SHA512 fe9e8346cfdaf06fd8f99e46e0dda904ed4a293b3be6a0075d70554f185ba73057907f6297585dd294f70f06f5429a392b4809c0a538eccf11a7a4d24279b283
 EBUILD netselect-0.4-r2.ebuild 1224 BLAKE2B f156f57386f65207949afd2c8e3fbf9ff3e1ae3470f8c1e85e7c7c2d9e8b819ad052cda0f930513f3e6c70f87b71ce7f966185bf1c31d2c83ee27d7097569961 SHA512 f7c2ed0e5adc4bc77289897a5bc62e5b394558ba35acd769abe0307fdc60cc1fae2738a5817eb15ccaa0820156308a707840499dc20caa13d00ba04b6c7104f1
 EBUILD netselect-9999.ebuild 1158 BLAKE2B bbfb32456f76e7a360e5b796c5bd6cda89cff53e3bbdefd37038655d38da420bb29d1b2e6179acb57c1c74c4ed1d48b23ae12e91177de1388d48887986394858 SHA512 928a53ecf818469203ee1d674d264ba7dd9f74206dd45f0d811b144f148ceb29e0c5016cd49d11f2db4ed8e6f81f7772333674d4fc9951ca391168737944ef81
 MISC metadata.xml 364 BLAKE2B 488b33eefda9653419ada58299197665494566461fbb659916e6d345007c21262567f5953525e3f0eafcc45427e252cf54ad85a2f2cfa07d3ab535ac63238a4a SHA512 eaa99f81f964c01dacdbb0eaf29bff94ee589a42023031bad6d24d15e23515c15ade496383726bfb543e3f6d66636b0822968425820fa472a4c7094fdb15903a
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
deleted file mode 100644
index 80066a138a33..000000000000
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ultrafast implementation of ping"
-HOMEPAGE="http://apenwarr.ca/netselect/"
-SRC_URI="
-	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
-	ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4-bsd.patch
-	"${FILESDIR}"/${PN}-0.4-flags.patch
-)
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin netselect
-
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-
-	dodoc HISTORY README
-
-	doman netselect.1
-}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5f825ebc37a1..84c9a5161ce2 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,10 +1,15 @@
+AUX nfacctd.service 372 BLAKE2B 9b15af6cf0c9cca8fbd45511db7bc51f2ca04aca349813bb8abc0670ee7a687c9453c13e9406eef7301a1c2a52ef3974fe52064197ede69d754e2d16a6ce52cd SHA512 0e25c7fb6a3ccf0e201c895c76e10bd3ffa258ee0de127e7a227369b50c8427601bdebdab53ad72cbcdae8f35ed3a4bc83b5234f616c0eb4aa64eb6509cf4f4e
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
 AUX pmacct-1.7.6-fix-mysql-crash.patch 1018 BLAKE2B dc8f53581007e068b96af57595bb2cd4b63638118087f088e7f7a2c4c74f528616cbfecd47062e23ff1a653e0bb80732f3703c07ec47e2060084cdea03405aa4 SHA512 706098dc5f9e1f265369039e27489e67c930eba3f711d81d70d85d5d33f75b2b9d5f81879bfe69159934f8c662fa4558916bd34338d765a45ff164d4512911fe
 AUX pmacct-1.7.6-nogit.patch 617 BLAKE2B 2e8d0874bf97ceeb0be43ecea9be9bb29094a4a663a688503520166e0807478b14256b89e8828bfb877fa1e3f70eb4e0cab52e2d40307506cfd833815b77f2f8 SHA512 383d95027b79f1eddd16d8e9490c3d324ea84b65a74fe0bcc15cbf231063f84ce0d5d2114b4cc35a50d6c46c9be1a53f52a4c16f555a3ebe144fa7a22993ee45
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
+AUX pmacctd.service 382 BLAKE2B 32bc56cffd69785a8ecc13b6ed7592c729f1d829ba5ad92c7928b54dc7f8e04a605806427ef9834f7d196c29ae77dbe31a51019e9ea95f745835f71c4e5f0730 SHA512 203aaa83ee4e194a11476a11e6b2eb787bcddcb8b3b5853c80520bbe1287286dfc56a28d3d34db03627a58e4923b7abf0ac41185d79a231061848cd990693cc7
+AUX sfacctd.service 370 BLAKE2B 49a18ae94d108d043f1e67f7c2082f7f154c2a7c5e795f457e6bf2b48fb8d43d9e94bbd9b07a0765e4f27f3b5e6339491701a470622b3d51fc031af91751a648 SHA512 89833651c56b63098ba93965470e7450ea44e43a10790e4bfed050031dbe8c5e15965721c20b0c7e700f693428f65a98e9737dd944efc477abd9776b18fed0d8
 DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a
+DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b
 EBUILD pmacct-1.7.6-r2.ebuild 2154 BLAKE2B e27390ed851b65f2040d0206dfec450cb3c76e47c873c28bd3328c34f732f094b64e8155d8ababa2456a654de58f3e6ee04232df842dd9a38c5541173bd62436 SHA512 29b3def341c1d7733afdc39a400f28b8d1e7adff7383e14b3d4f3a5ddf9b9b1fb95a6626e901b0b2feaa3ab4946414e3fcd1da95c6e1f86e3ca9bd8dfe45edb5
 EBUILD pmacct-1.7.6-r3.ebuild 2196 BLAKE2B 257f50df7f45eed32ae95965998b77a11800dd4fa2f8f010442525002a262009a11619941aa4ad99076e39f59deceeb05f8a6853036c6c55642441d2b3359c4a SHA512 dfc7ec6b9f33cb21797271ac5b533dcce5a3c36bd0696fb116f6534a5c0c77354bb663671642403d46141c8ea7662930432c0618bc6c50cd86efc0614409eab1
-EBUILD pmacct-999999.ebuild 2109 BLAKE2B 42b545bea0b7c97d1bb12a8c2247be19fa6b335703b160b77d4a6cfe292258a87660b026eedd626d7d7e4669239eb866f852caf1fdc5800e0c4334cd8a00296f SHA512 e39cb151c33ac53a22376a55a5d23d99561a5c7fcddbecf42dc966e1112824a16e86aae9925a3c66645d68aa8230f71061defd3f4c41b3807b7bb73a2ac1d6f2
-MISC metadata.xml 1241 BLAKE2B fdaae9649fb01505523873cdf5873329e4a636b4cc7087f5bcf9cf0dec5acc907d6cca8a8bb0c9e8b5ab378aa76c6ab5dea5da42647daca8a1a218c0ae1985a2 SHA512 5f94b8356e7c0be897534a2a78ea78b43bd763764a179e90a44ba662dbffdca4ce12505d64c973bbd8bd51dbe5d45a40b2ff3576a0af8f8d88d0ae31e9c6228b
+EBUILD pmacct-1.7.7-r1.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0
+EBUILD pmacct-9999.ebuild 2375 BLAKE2B 90f2386edb435fd1d1274f0951833405f860494570f04061e92efce801cac61b985bfc08ad68a27baf4c2ad09886b1cf7676aa2f9af14b09b9eeb957ca20baa2 SHA512 b417bb4f2b7ee8580c876381dd601d79dd4adefa276b16e7c9e2564dbf14a7fd94f376eed6636a4cfc1fce70a272683e65cac5894fb694d7b602f65ddd551cb0
+MISC metadata.xml 1319 BLAKE2B 0c53f8db498bcc1837e4f99ee751c5948eacc6cb513efcf7fc63f160f863a6995048b5e7987f28be2e5b0d190b7830a6d5a3f740392087371bd977ac1a50ba9a SHA512 a767f13848e711702a32586ebb02401d93e9ef65eca1d5a7f1b7951d4875638b730d074a8c09cbdc0d14b1b9b641472102ea91d1c52b4108201f7a382b2b142a
diff --git a/net-analyzer/pmacct/files/nfacctd.service b/net-analyzer/pmacct/files/nfacctd.service
new file mode 100644
index 000000000000..d649f47030bf
--- /dev/null
+++ b/net-analyzer/pmacct/files/nfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=netflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/nfacctd -f /etc/pmacctd/nfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/files/pmacctd.service b/net-analyzer/pmacct/files/pmacctd.service
new file mode 100644
index 000000000000..a2dbb8c45846
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=promiscuous mode accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/pmacctd -f /etc/pmacctd/pmacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/pmacct/files/sfacctd.service b/net-analyzer/pmacct/files/sfacctd.service
new file mode 100644
index 000000000000..7a334e0ffadd
--- /dev/null
+++ b/net-analyzer/pmacct/files/sfacctd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=sflow accounting daemon
+After=network.target
+
+[Service]
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+Type=forking
+ExecStart=/usr/sbin/sfacctd -f /etc/pmacctd/sfacctd.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a700a40b473b..1c025fea769e 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -19,4 +19,7 @@
 		<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
 		<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">pmacct/pmacct</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
similarity index 53%
rename from net-analyzer/pmacct/pmacct-999999.ebuild
rename to net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
index 4446fb29a9c9..55db903b6abd 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.7-r1.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+inherit autotools toolchain-funcs systemd
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
-EGIT_REPO_URI="https://github.com/pmacct/pmacct/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pmacct/pmacct"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz
+		http://www.pmacct.net/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
-	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
+
+IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq"
+
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
 	kafka? ( jansson )
@@ -41,6 +47,11 @@ RDEPEND="dev-libs/libcdada
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+)
+
 DOCS=(
 	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
@@ -48,34 +59,36 @@ DOCS=(
 
 src_prepare() {
 	default
-	sed -i -e 's|-Werror||g' configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--without-external-deps \
-		--disable-debug \
+
+	local myeconfargs=(
+		$(use_enable bgp-bins)
+		$(use_enable bmp-bins)
+		$(use_enable geoip)
+		$(use_enable geoipv2)
+		$(use_enable jansson)
+		$(use_enable kafka)
+		$(use_enable l2)
+		$(use_enable mysql)
+		$(use_enable ndpi)
+		$(use_enable nflog)
+		$(use_enable postgres pgsql)
+		$(use_enable rabbitmq)
+		$(use_enable sqlite sqlite3)
+		$(use_enable st-bins)
+		$(use_enable traffic-bins)
+		$(use_enable zmq)
+
+		--without-external-deps
+		--disable-debug
 		--disable-mongodb
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -89,6 +102,8 @@ src_install() {
 	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
 	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
 
+	systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
 	insinto /etc/pmacctd
 	newins examples/pmacctd-imt.conf.example pmacctd.conf
 }
diff --git a/net-analyzer/pmacct/pmacct-9999.ebuild b/net-analyzer/pmacct/pmacct-9999.ebuild
new file mode 100644
index 000000000000..55db903b6abd
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-9999.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs systemd
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pmacct/pmacct"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz
+		http://www.pmacct.net/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq"
+
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="dev-libs/libcdada
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson:= )
+	kafka? ( dev-libs/librdkafka )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	local myeconfargs=(
+		$(use_enable bgp-bins)
+		$(use_enable bmp-bins)
+		$(use_enable geoip)
+		$(use_enable geoipv2)
+		$(use_enable jansson)
+		$(use_enable kafka)
+		$(use_enable l2)
+		$(use_enable mysql)
+		$(use_enable ndpi)
+		$(use_enable nflog)
+		$(use_enable postgres pgsql)
+		$(use_enable rabbitmq)
+		$(use_enable sqlite sqlite3)
+		$(use_enable st-bins)
+		$(use_enable traffic-bins)
+		$(use_enable zmq)
+
+		--without-external-deps
+		--disable-debug
+		--disable-mongodb
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index aa78d4817867..30a4037b0025 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,6 +1,8 @@
 DIST wapiti3-3.0.5.tar.gz 573630 BLAKE2B 4f6425c54542e3fcf12f50a7ebe4aeeb38083bd04e6a9415466a24ca907e787149b6462972cb6c9d29f4c89bf1f941ae2566b126746bee3697172f342befd7fb SHA512 c1bfdcd4114ec508b4b16e7a4389b23b25326816c7daf0e7fb634ce08b59b983dec92f92287a18cbe7ecde9a06a04da98cfd744f818efc57c606be143fe7db4d
 DIST wapiti3-3.1.2.tar.gz 654586 BLAKE2B 6abbb35060ef554e8b803a82744527a361fe3803871b39dc078938c4af70a3f6e1a2adeec95c0ff487aff650d92a3638cb655439d342c2b516a5279ee02af472 SHA512 cd16d5b265a49441ad45341630ea6a2df150172b774d3282ee229b5a73274eed293ad35c6fc5e26443dc96f1437dcd28b77240210840c65cb3f1f7b6e9234c2d
+DIST wapiti3-3.1.3.tar.gz 651457 BLAKE2B 7b0a0837012a25c4a0d4288730bb16dd056910d79e8d26712d7e508a9a51d7e23eb5fc29f0a619b534e2fe5e87262d91d4c29db50a02b500eb516c68f0850fc3 SHA512 321e068ddb117faa42c3f8cb01957ec7313a700bcb5b312b832d717a3957d3f6226bcf67c4348cc0b91cb13ec713828d0b03b662ea2f170d32f88d0721dd93bf
 EBUILD wapiti-3.0.5.ebuild 1178 BLAKE2B 89931c4319e7a120ac3fe1e06770a11691d75c41c8208e01b611448cc6bbe7b6b8d24ced28b79bc4ffd0ce5cb09607088ae6c255b93be9216623064a40e8ef5c SHA512 57d8831c22c3473923c546badfe52c067dbbc75b0bd263274d7f7ec7aa26e30f47722d1a96a5edea44e67191ad121e253652c5976bc94fc896cad4f76724a615
 EBUILD wapiti-3.1.2.ebuild 1390 BLAKE2B 562667e0a3c36ce3f4d4257cf19b67fd7016d0b79ea23568824e132209fb63bbcb9fb321b6bb1944de2ee1e173d633125d27f219bab960158a12f30c99ad9e56 SHA512 457adf9733fd0c914643dd5bad43069c983da43b06932a78626ef68faa37e26ee4716003813f03fdc86031e00b08c78660a2b54bf5eebf2b4a98ba2ba1591960
+EBUILD wapiti-3.1.3.ebuild 1390 BLAKE2B 562667e0a3c36ce3f4d4257cf19b67fd7016d0b79ea23568824e132209fb63bbcb9fb321b6bb1944de2ee1e173d633125d27f219bab960158a12f30c99ad9e56 SHA512 457adf9733fd0c914643dd5bad43069c983da43b06932a78626ef68faa37e26ee4716003813f03fdc86031e00b08c78660a2b54bf5eebf2b4a98ba2ba1591960
 EBUILD wapiti-9999.ebuild 1358 BLAKE2B b7d0920f05fb6a45ad568fc6a846080927a180a64b1e59e984ae129a28f1dfb0351953aee24ff6ed290fa8273c3af58dbf2b5f183067476db6abe12faf339e7a SHA512 0a82eb56c829168b37e901085c465be634343a98c227076806170b8e21b565ad4fe5c1ecacac3efe613ab7eaa20149cdde45f4fd30ca29e1b25bd430a5d7097f
 MISC metadata.xml 865 BLAKE2B e8781a338561470a25c292df4d1daf6e44321f78c9209b5606bc2fc1746853750b591b670ebd2567423926c4b65d85580e0d752c3dfd0b833b8010f4f4cb5f48 SHA512 f67382517b25273f45510a2d84128c139b9ac989584290c1ff84e22c16ba79d5a950071434ab54818a09c127db6c0ab1f3c15bb1e1171c9618b7f8c3744e9876
diff --git a/net-analyzer/wapiti/wapiti-3.1.3.ebuild b/net-analyzer/wapiti/wapiti-3.1.3.ebuild
new file mode 100644
index 000000000000..8d4a9ed067d8
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_P=${PN}3-${PV}
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Requires httpx-ntlm (to package)
+#IUSE="ntlm"
+
+# httpx requires brotli and socks, so depending on
+# dev-python/socksio and dev-python/brotlicffi
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/socksio[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Tests also require unpackaged respx
+BDEPEND+=" test? (
+				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/responses[${PYTHON_USEDEP}]
+				)"
+# Many tests require execution of local test php server
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	sed -e 's/"pytest-runner"//' \
+		-e "/DOC_DIR =/s/wapiti/${PF}/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 4bc603b433a1..80e3f326ac47 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 8d807e20f930..3b1a4ddf5f5c 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,6 +2,8 @@ AUX pdns-recursor-4.6.2-parseACL.patch 711 BLAKE2B 95e5a602909b0d293b50304d21844
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc
 DIST pdns-recursor-4.7.0.tar.bz2 1596954 BLAKE2B d2fb35caef19ee21ff495deb19939659940f245b44f6ff38977f328af9821862b939c48b5052b42ae83ae09647bab53094816b6dbe784737ef4c53ba02add855 SHA512 095272311623684a5a465ae48bd97b86ffe27d4092dea5dceee915ebb071ffb976eeb4055d560d834a3fafab0b15808137e384f28b7cec24719b78ac024e48c2
+DIST pdns-recursor-4.7.1.tar.bz2 1597536 BLAKE2B fc5d7ee80823ad55a986a9317d4be5be7d1ec1d1b993a5bb1bf0c138a901d4f81d4ebcef5e9774cd5de88c9f650053be26dc01dfd31b989dae25d53d12b87bad SHA512 7769c4c082bbf52b0e13adbe9c1c7272a638c0b2b11e1d76794cea66dfe8dc83b07989fa16707a7cc682e8c366ef4c1d37a614ad2841af33ccb9adec6270e07f
 EBUILD pdns-recursor-4.6.2.ebuild 2084 BLAKE2B 450ba72505ca8c6d1c9f30c89490e6a6f19d20c25b15fc125827b589397ece3af97a8e5f3f7d37a9fc4e974d5a206108ee47bc8a82831b395d386ef6ece09d88 SHA512 019bdd87dfd978127b558d56e174b00913320d7b61edd87fc9a421025685adfa27bac612d7b925f4b5bf4b3f7a05fc09b40d215720025911a646296a280d63fb
 EBUILD pdns-recursor-4.7.0.ebuild 2038 BLAKE2B 3fe15ab77462c178800157bb3248a19751537d8f22871f68ab7b4aaac6cf418bf44723fc8a02f07c31082f9779769a3108ba5dde8f3b5d54eed489f956a597ec SHA512 1c701eb0f365992294ebc93ea073d1ed6dc5b1336d0ce57657a70ce14a4448aa16ef433c1f71ca076ca516d268847fb40295e1c2c369c20ae1314fb4a0d26f1b
+EBUILD pdns-recursor-4.7.1.ebuild 2038 BLAKE2B 3fe15ab77462c178800157bb3248a19751537d8f22871f68ab7b4aaac6cf418bf44723fc8a02f07c31082f9779769a3108ba5dde8f3b5d54eed489f956a597ec SHA512 1c701eb0f365992294ebc93ea073d1ed6dc5b1336d0ce57657a70ce14a4448aa16ef433c1f71ca076ca516d268847fb40295e1c2c369c20ae1314fb4a0d26f1b
 MISC metadata.xml 930 BLAKE2B 997ed7f557ddae9d8a5b3f92396cb5acb9cde67de5cc750c4c3b051635557ff22fcdd94400a95cc7e5328ccca9786fe3b780c81d57f785865a18e68701916d00 SHA512 3415ed721ad143cae712ee309ba9f3057273b8e594617fe12382bd316cad7dc6e2ed66d660d9c13fa3db993852c85f21d1ea1c0367e595dd5bbf782add225cd1
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.7.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.1.ebuild
new file mode 100644
index 000000000000..fe258d909f08
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.7.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=[context]"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b8e0b6ad0e31..8b58e186eb15 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index daf97640ad03..1ab165f282d5 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -5,6 +5,6 @@ AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc3
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3349 BLAKE2B 189604b45e34853c1b20076fe92c2319f5a6f7eb3381e552a3a727bf94d582f6e613eec0c02d34cbf974f9dd8ae6b78e7c3d9f31bdf323fb97c9e44eecf92489 SHA512 91b7d4dc665d0149486fb9a616ec7c68dc0e2c7ab0116400f67839a3033d87f869c9b6c391e1586dd504d196a44eecbf55f557ef064869927e21ea818ea28343
-EBUILD bitlbee-9999.ebuild 3218 BLAKE2B 8231cd3ec7dcd56b6d3e9dedc16715698fa83825a57696c4b8e10c4293da034d6b99338a8288e4b969cfe4905523e1a5c8d5bb6cfd04a2526884f83be726c241 SHA512 f68f23551d8efe102585e4541903e882a8e623754cdb1d6500b65cf922af8bd6ce56adbc9b4f7ed25b9f57f1963ea25dbc143d973e2575d2d02ff7e65afe6a4d
+EBUILD bitlbee-3.6-r1.ebuild 3349 BLAKE2B 6fdcc45ce8c781104c6d99833f5dbc6a58869fef831c9fcedc5f51c2712eaef88d538162fe1ee5371dd052d7e1cd2ecd82ce449a045d73f8f26f80e852e143a0 SHA512 8c4d2d82c6d9af52690d176c7712399bd5661c691025903f45cf4bee57cbf18b89406b7e098467dad21c2c66a60aab2ff750f7f2b0e8e9bc8d41a0d4fde24f81
+EBUILD bitlbee-9999.ebuild 3218 BLAKE2B 52f5e6430c79a63512a5287b2fe5e252b47e135bf780406caa713a87b8e4cd16bf789a6f20616b725ecdedc4d11622849e0037f6b9654c9ba967109ec53d0bd0 SHA512 5dc19698ce6f2336c9e9d64d0164b58c277674e0d31b623b0e5d062a3d9eec3f76e6023d411396f90dfc6d1115e8cdbfb30ff7e9ee583722c8f68cb0abd82060
 MISC metadata.xml 1169 BLAKE2B b384f4ab61b50fdaf1630d410115ec567cf9bceb10df90e1781f4e133d644c146ac9db005c831735acf2f0ff2e167980dd7b07ca30527330777314e1d69756bb SHA512 fce71cd423777ffa60edc7e45805c1e622c2a9590409772c77566f6945f25389aca1d8d9e5424effa2008ded1ae394d3b9636197bb59e0b74c294eaa97419753
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 592437d7f4bb..c54da3fb2392 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 075402136f9c..fc8360cb0399 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 7686aa655fec..336dad99715a 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,3 +1,5 @@
 DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7
+DIST neochat-22.06.tar.xz 336432 BLAKE2B ad77e83bb64137bb3f4597999ed2db0f47a83a0e253150b7a27903acebfd28f58062b8dcb8c393312d11f830df6e6b208d07daa016e99b4c75c16f3da1aa85ce SHA512 d7f3776620592f509f9db42c5b8118c7c5d6f11ad152502a36bd49c8aa56bf3b6c0056ec1dfc4268002b6c035926aee6e9e835de271e27ebbfc2bacda218d13e
 EBUILD neochat-1.2.0.ebuild 1230 BLAKE2B 08c43f26e1278cd5c5d251a4f40d76fb37cfa50ac6144d7c8204c719531471397de566071f6380a063acb73f026a985cdbded53910ad54950ef69dd38e38d423 SHA512 5ae77134fd6b30b10a35d2f826c58cb478b987c199530a2ff500a02871c5919508fa0ce288779c1d163d9b2f6f5f3ef23eedd336a09e8ea59cf59533b818491c
+EBUILD neochat-22.06.ebuild 1444 BLAKE2B 5cdac2a6b153c7a8262243720e0a8b9adac1fc48b46e1302b0502d5f3cadab54a9b152c1b3d51ceae553c8d180421e99bf86b48e2f09f1ad59b615cd0ba81161 SHA512 265e7889b5bf7bf3ab6686e87b8dcbd672885a6fd0fb3540c6f8f4edadfb99a84d2acc21cb8283c3b85d29816ccef846550311cb157770bc5e99608547438bac
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-22.06.ebuild b/net-im/neochat/neochat-22.06.ebuild
new file mode 100644
index 000000000000..76ab2e137c10
--- /dev/null
+++ b/net-im/neochat/neochat-22.06.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+DESCRIPTION="Client for Matrix, the decentralized communication protocol"
+HOMEPAGE="https://apps.kde.org/neochat/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/plasma-mobile/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	app-text/cmark:=
+	dev-libs/qcoro5
+	dev-libs/qtkeychain:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5[qml]
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	media-libs/kquickimageeditor:5
+	>=net-libs/libquotient-0.6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5[qml]
+"
+BDEPEND="virtual/pkgconfig"
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
new file mode 100644
index 000000000000..a7d37496aa08
--- /dev/null
+++ b/net-im/synapse/Manifest
@@ -0,0 +1,4 @@
+AUX synapse.initd 365 BLAKE2B 064dce5e10596316509f321de9819edab15fc91551e5fc9747c3a2bf28326d9db764046831689cc425ffb7bfedde9607132ebd412ad0ac0becd9d79990c0fc80 SHA512 ec87c250b9d72d3c937ec57fcd6a487c92ef341b3b46ac53fdd7b1371d71ed518c5f94e7ec63e5c859736c73b7762143e113fed9b2dfffbf070e14525b25a840
+DIST synapse-1.62.0.gh.tar.gz 7841903 BLAKE2B f3002798a3fccd1b7fc4a1a302d12dd0940727ce8e89bcab0fdda04d498dbc9e469d21e7815db75b3593fcdfa01557e6828a39e874e946ce1b43d51cfe459ee6 SHA512 2bf9264f08fab29e8707317b69c52a4234bb25443c342ba43a27e06c506bcca1a9bdb211a99802abbca551e4f4288f68775d4629493b39d58dfcc8d8d1ca8ab8
+EBUILD synapse-1.62.0.ebuild 3004 BLAKE2B 159e0a344c64f2768abdf21267088ab22b6b69ad364685244cb200b4580863ac0c8d66c50d230b8633d9d6fbaf45a21723be1500d1c1d8679f4d04138b0e4c82 SHA512 49089f7ecdb33ed7207eaf1a06b1910ee89f49bff05ce5917d514c112b755bea6875c8e8d96ceab757202b295782ccd5ab04f5470cc69809bf467e11dd008617
+MISC metadata.xml 474 BLAKE2B 1e990bd0b3e6234f15e2e036ca6c9157b6bb27c36542e24d5e80a5f2a8dc04a592ee267869869d79bee00177ac8c11ddb630483d802c3d6be49317d41ea41cdb SHA512 6447082bda7509c395fc60bd23fb506d1d61cc0d6b89aca7d68c263270bb7d941f3ea95b18f428c301b0f0cd536688856b85ea264b0facea7cb5d51bd5909c46
diff --git a/net-im/synapse/files/synapse.initd b/net-im/synapse/files/synapse.initd
new file mode 100644
index 000000000000..e8e494c722c0
--- /dev/null
+++ b/net-im/synapse/files/synapse.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Matrix synapse daemon"
+description=""
+command=/usr/bin/synapse_homeserver
+command_args="--daemonize --config-path /etc/synapse/homeserver.yaml"
+pidfile=/var/lib/synapse/homeserver.pid
+start_stop_daemon_args="--user synapse --group synapse"
diff --git a/net-im/synapse/metadata.xml b/net-im/synapse/metadata.xml
new file mode 100644
index 000000000000..8ce7426a7984
--- /dev/null
+++ b/net-im/synapse/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
+	<upstream>
+		<remote-id type="github">matrix-org/synapse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/synapse/synapse-1.62.0.ebuild b/net-im/synapse/synapse-1.62.0.ebuild
new file mode 100644
index 000000000000..d3b5db281ed0
--- /dev/null
+++ b/net-im/synapse/synapse-1.62.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+	https://matrix.org/
+	https://github.com/matrix-org/synapse/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/matrix-org/${PN}.git"
+else
+	MY_PV="${PV/_rc/rc}"
+	SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/synapse
+	acct-group/synapse
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/bleach[${PYTHON_USEDEP}]
+		dev-python/canonicaljson[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/frozendict[${PYTHON_USEDEP}]
+		dev-python/ijson[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		>=dev-python/matrix-common-1.2.1[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/phonenumbers[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},webp]
+		dev-python/prometheus_client[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pymacaroons[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/signedjson[${PYTHON_USEDEP}]
+		dev-python/sortedcontainers[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	') )
+"
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /var/{lib,log}/synapse /etc/synapse
+	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+	fperms 0750 /var/{lib,log}/synapse /etc/synapse
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
+
+pkg_postinst() {
+	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+	einfo "In order to generate initial configuration run:"
+	einfo "sudo -u synapse synapse_homeserver \\"
+	einfo "    --server-name matrix.domain.tld \\"
+	einfo "    --config-path /etc/synapse/homeserver.yaml \\"
+	einfo "    --generate-config \\"
+	einfo "    --data-directory /var/lib/synapse \\"
+	einfo "    --report-stats=no"
+	einfo
+	einfo "See also upgrade notes:"
+	einfo "https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7c8a57fec196..85528bdabe13 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 5ebfeb57c3b9..8554e3344929 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,5 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1-r1.ebuild 1569 BLAKE2B 2aed4950b1217fc0592574ded6797d988f7d92b24f62e24effe6c6d25c56c27fd6001731266c655ad16f7b306fa720f0fa3f755b4d844b36a251d1d4eafe26c8 SHA512 b13887904a436678f4259bd25ec9f68610b1b5ae5973482cd022a97a2ccf3cc4cf15f46e36c333829bf3932de53e487d5383e33365e9501dcfb3b6877bc52348
-EBUILD epic5-2.0.1-r2.ebuild 1342 BLAKE2B 373953eef8a863cffd2f23431dc8cafefa7f1ea7913333f7e518005087a3a29d277eb476b307e36f4a58cf49139bde8ed99196c2b7868b07a4ca141934ff9193 SHA512 13037670836e1a8447b7eb0b26ecd2efb7b0dc7b30c1f21905f47cfe9191303d2a5f8cc562cbeba03c3183adee08fb896adb347aa362cd1a1785ced85bffbd2a
+EBUILD epic5-2.0.1-r2.ebuild 1340 BLAKE2B e3f9b4ff9fc3e33079566e391f687befe33d03f9f246b32786d36bc42d51e48afe0243389117f5f520b9dda7524b4a88c04db3478301d8a0c146eaa92ef9992f SHA512 3bee2e64ea8ebbe62ba2df89f0bd9dad177c53d960b575d0a0b46844deae452c8c3215ba5cf840cd7c61cd8f331f20fcd414c52140f46411f9041d17b1e49839
 MISC metadata.xml 448 BLAKE2B 10ddc66039b8d1682373a0dc5ad54648714620eaf086b60617603704173edaf546b9a84d03cf8a1acac7ead63cb8538136d054830b0cd85001a7b110ed3190b8 SHA512 7814c7266093439d1607b58b4d8d22340bc19ad914fe9b55c2cac19f06f73c3ffe6e0624c43261766e4532d3aec42fa74f76005c636802f075a5ba4cf8e3d8ec
diff --git a/net-irc/epic5/epic5-2.0.1-r1.ebuild b/net-irc/epic5/epic5-2.0.1-r1.ebuild
deleted file mode 100644
index df6800edb35e..000000000000
--- a/net-irc/epic5/epic5-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-single
-
-DESCRIPTION="Epic5 IRC Client"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
-HOMEPAGE="http://epicsol.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-
-# Fails to build without ipv6
-IUSE="archive perl tcl ruby socks5 valgrind" #ipv6
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.8e-r3:0=
-	>=sys-libs/ncurses-5.6-r2:0=
-	virtual/libcrypt:=
-	virtual/libiconv
-	archive? ( app-arch/libarchive )
-	perl? ( >=dev-lang/perl-5.8.8-r2:= )
-	tcl? ( dev-lang/tcl:0= )
-	socks5? ( net-proxy/dante )
-	ruby? ( ${RUBY_DEPS} )
-"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	# From Debian
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-src_configure() {
-	# Because of our REQUIRED_USE constraints above, we know that
-	# ruby_get_use_implementations will only ever return one ruby
-	# implementation.
-	econf \
-		--libexecdir="${EPREFIX}"/usr/lib/misc \
-		--with-ipv6 \
-		$(use_with archive libarchive) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with socks5) \
-		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
-		$(use_with valgrind valgrind)
-}
-
-src_compile() {
-	# parallel build failure
-	emake -j1
-}
-
-src_install() {
-	default
-
-	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
-
-	cd "${S}"/doc || die
-	docinto doc
-	dodoc \
-		*.txt colors EPIC* IRCII_VERSIONS missing \
-		nicknames outputhelp README.SSL SILLINESS TS4
-}
diff --git a/net-irc/epic5/epic5-2.0.1-r2.ebuild b/net-irc/epic5/epic5-2.0.1-r2.ebuild
index 1f531895fb25..a8525b1ed375 100644
--- a/net-irc/epic5/epic5-2.0.1-r2.ebuild
+++ b/net-irc/epic5/epic5-2.0.1-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://epicsol.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 # Fails to build without ipv6
 IUSE="archive perl tcl socks5 valgrind" #ipv6
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index ee61cd62f129..e51f6e33679d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,5 @@
 AUX irssi-1.4.1-no-werror-decl.patch 486 BLAKE2B 8999e9e015c642cb79007e419882f59f51ff1faccc32b285fb7b179e2f2d2d54632707fe70fc66d03174590635439e21390c98e0455b4df382a48c4e445ca95d SHA512 b74cc0b10d0d4a138f4f6098e967a27b9c1ada5f1b5159129b7885fb9c736f1766e4a6421eae34cfc1232efed705b26b6f40d712a518a149d987f8b29706baed
-DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc
 DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda SHA512 e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22
-EBUILD irssi-1.2.3.ebuild 1455 BLAKE2B ec9f79fb5b19bf8a2f852b66e004b3597edf4c6ff50d1a80e47ebc2ffa1c71ee04d1ce8ee638d82d3e5f59c602d68e1e4ba9c5484a4feae0d4f094ce563aee1f SHA512 f7a49411bfb9ce9dcc421f71ce201b469332e8c79a0665c4572bb4c06d6b0993c868c161213dad0dd7ff784ae79f9a7572855cb4e04829931019f8acbf689c99
 EBUILD irssi-1.4.1.ebuild 1622 BLAKE2B a8ea26cced365e4e6b024a25ff01c394f8f2daf1f997583c7c3314e1998f2c4326e662c767ad803ce0e1089b0bc5b75fe0b6a2bcb11187c9e7ccb1ef231bbc08 SHA512 6e54115a71295ea1bd1844d292ec611b189026214fd345c8e77e7cbe813d1f08ebb64e7043e58201c42d3c96f4e0747ce0aeeff66cf6ed15aaaef087577125ac
 EBUILD irssi-9999.ebuild 1572 BLAKE2B 68ec2faff2ae5ace3b78f304092d3e0de378f8553ef32e0a4490bb0d4d687c7c6cafdff4a7cf8f9a4a9c4cd7e7b1b389fd5cb319f43159d76d3bf23f806ffcf3 SHA512 1eadd661f4f0f407e5e4e15900ee7a9a1117321c7a441ff30c1f03738de8f89bf492745f136b2a0a5c346b029ea6731ea2caa703d5612c54c74cf27f5d11e4dc
 MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
deleted file mode 100644
index 371f59c83591..000000000000
--- a/net-irc/irssi/irssi-1.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="otr +perl selinux socks5 +proxy"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	dev-libs/openssl:=
-	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0 )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-	export ac_cv_lib_utf8proc_utf8proc_version=no
-
-	local myeconfargs=(
-		--with-perl-lib=vendor
-		--enable-true-color
-		$(use_with otr)
-		$(use_with proxy)
-		$(use_with perl)
-		$(use_with socks5 socks)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5a744a186d14..4601e9cf1eb7 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 6889e9a5e437..33f2766fb9c1 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -4,4 +4,4 @@ AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f3
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
 EBUILD libetpan-1.9.4-r1.ebuild 2181 BLAKE2B 2bc6319caafff8b9d976fff913c80c3bc8495e4f5936d6033e511de0cae78897a848dadc6fdef0014c8c54c4c65ebc8fff6072f1cbaaf089ee522249cbd54d81 SHA512 52f798514786f2314355c71cc6f77b3304553ef4bb55c69b628290f664f8f14ffed3428fd6b9b3da68dc863259601c71765dbeb6f0856fbb9802a33786184fea
-MISC metadata.xml 745 BLAKE2B 7feddb37f434171fe784fe6c07f8fcc4b59acd79ec9d4f13f8156263f434a0335d5780258e2d6d59c5bdb7c6d2e608ad252e729159735040e03dd7ed8aaa3ed6 SHA512 0ee77ead26dc00ee97d5752728f3ea582557a28eae8530f74e085190ae15f3c70354e0fe1db656cc1f3e47338af62eedf3bbf9879d676e56045c2075ba1719e9
+MISC metadata.xml 830 BLAKE2B ecbe9abd08e475cee86443cd2dda3ac13dd2d35000d1dbd9540c70ecfd9d17caf5e62d4054c89ec7377d06739d9744eb84869c656e5cb46689a7d8616373fcae SHA512 de9612383d1734ed824323cc4b5c72ea55f2f0bf38f6fc25c8830851fe7d06100fbdb5175ba70a333d611d95590ef69da5bae4d44d310cce48118668131f6267
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index d2f539456b7b..3bb8281ff4b6 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription lang="en">
 		libEtPan ! is a mail purpose library. It will be used for low-level mail
 		handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index e1fd96ce8d69..2d284eeef928 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -4,8 +4,10 @@ DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4af
 DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
 DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
+DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-4.0-r1.ebuild 1425 BLAKE2B 5085e685f10038dad0b6f22f4e03cb933725f2dcdec5e011065ad1ad21413ef11fed9b82b2e6ff9d5ab142c9d15f6e9a558579c2503d7b21dab4459e9bebae4e SHA512 6eb175d07df79f2750721f3d4c5880bbdb6aa6106e052c4b5ecea2192a034e95c9f18543f36171992e67536bd0c482246eb12fd1e72c50c48f38b3e2a1e5d82f
 EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
-EBUILD nDPI-9999.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
+EBUILD nDPI-4.4.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
+EBUILD nDPI-9999.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.4.ebuild b/net-libs/nDPI/nDPI-4.4.ebuild
new file mode 100644
index 000000000000..e2efa26265f9
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
+src_test() {
+	pushd tests || die
+
+	edo ./do.sh
+	edo ./do-unit.sh
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index a7730e61c252..e2efa26265f9 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools edo
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="https://www.ntop.org/"
@@ -34,11 +34,17 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
 src_test() {
 	pushd tests || die
 
-	./do.sh || die "Failed tests"
-	./do-unit.sh || die "Failed unit tests"
+	edo ./do.sh
+	edo ./do-unit.sh
 
 	popd || die
 }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 3aa5529ad70d..39c705553f00 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,6 @@
-DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
 DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48
 DIST nghttp2-1.48.0.tar.xz 4112072 BLAKE2B a52dc1ef4c9658298acef5ad703bec1708e538ebe19584dd5fcfe39089777e105594a998c7db696ee54bc8f17d3086828c09e921d8714b7ad3efbf33d04aaca0 SHA512 77c22371290f77e8a538b9efea225d23567cc27cb60b71703cbcb057839b5f117cf50796aa82bf4518f22b38a5773e90a1c273eafff4b17c435ac5858bdf7c6f
-EBUILD nghttp2-1.45.1-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
 EBUILD nghttp2-1.47.0.ebuild 2025 BLAKE2B 7c4dbcfe5083f983192851ff027a016ad9b4d03c645c8ae1ff752864dc818210d8defea0186a3f59141d9da5012cb97c0f729c9512592e6fb8c5fd56035a66be SHA512 ca9538daaa140b909ab39228b9f43033f787e0c8e5fe4533f00b0fe6da80327feabc05e8ce2f09770e8d6d5150c02e5790b6db5332c20e11ffe8abd5dc515df5
 EBUILD nghttp2-1.48.0.ebuild 2033 BLAKE2B 0297639e79cc12bbed801326c356d9df5624e2a1f87790d664b11b33dc653fe91bfde16dfd764bfc7aaf99128f5761d2cf0628092a467344f1e161595a4761b9 SHA512 25de51ea35fc2031a92e4fcb80304a70525924faf94f380160bd8440b0f74ec267730c9cf50b529fe222165d78895a5022528cd9769e3e03e1521b816a0102a3
 EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
-MISC metadata.xml 409 BLAKE2B 3776b71b2faa9874969486a9aa59b467b990ff5aa0d3ae1db4e1040d36caff429f1702d859641a1534175022c3536fada7f79c411702e29ee7186b1d459add41 SHA512 ae666b6ae5405a33231f4caff4e73ebd69b83d4d68bff0443a3cb3d5301bcf0837cc03b693c13e65562106eb4f17db47f03b7c2035803f779d23ba30bf6b0a5d
+MISC metadata.xml 494 BLAKE2B 674699650c76287d91d7e10f3c534f6ece6a3620231a2c09c2b337ea9d9dd9cb9ca793378182589780a93afb790a214cb19eb07e0da7fa5a4d13295fa38f97d2 SHA512 ef1701f1c7089aa13795c18a5c50221bdb7d082247e450f792deaf787516039b6e53ead3b2d5e2324cf1edee4fc9a4d270c7ff5f924a2d9487d39404c659e828
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index e77d9ad83697..6963ff8b1f5f 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
deleted file mode 100644
index f79b1b5a91ea..000000000000
--- a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c245879f733f..6e11651c4ae0 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,4 @@
 DIST rpcsvc-proto-1.4.3.tar.xz 167964 BLAKE2B dc15392fd68b76ffa92c08039076aed293834b047ebea4a418dc767ea13e3a04b19e5108ebda808dfa4356ca426db610847758d69b23cc66981eb4ea844eb218 SHA512 e46ba9ccdd6c520128bf3a154db90742f288a4d593b094a630141cdc5aeb834ffebf9b0eb6d5d0aad9faef3c445c75e2355cbc3e1382b50d29f4d2799441c6e9
-EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B d02a2aa983d5e6d8dd4820ff83620738db7b90232a13779b30c8d1d496a1e470438cef75a7b6c2022bcaa49e78cc78423160d04a2c753e79225c1103d47fd744 SHA512 8ac3092ffbeaf07868ae78ae28a490812cc2c2a8902de71c7701ff89107f97a42d6be5699285af02d8b0767315c2b5ca5951d2d44542065464d5ed951dd70538
-EBUILD rpcsvc-proto-1.4.3.ebuild 918 BLAKE2B aa283b93c91a501d2a3d33132c297c7da09fe0a4f64ab96b75138c1035e7a739c0322f2534d45d85b4bcc7f24a0aef1cf0db171d1cc5087960b0a6e64863123e SHA512 c534448ed72ff1dc792ff450c030acc1d644ed32ad264b585f220bc42ebdf82fe4ff340e22a217c7fbbb5b0222d3530b382805b245dc5868dfe4966d527479d4
+EBUILD rpcsvc-proto-0-r1.ebuild 471 BLAKE2B b0b4ceaa115b11ede6f31697b22ef19201a61918b8b64efa5e46e859f9e566459e3d9e3e12199eb93075d7d01b3fa21b0b81155f1ebbd3ecf85ac2ba212b2f1e SHA512 2259a0d8b0a1357c882de4d3d1db7cb95cc2756e8d83a2677e42418a5c6549a90e6da0a870cc04935951623cb713c9eb15077f5680e011087e78ef0d14ca80f0
+EBUILD rpcsvc-proto-1.4.3-r1.ebuild 918 BLAKE2B 6e063eb95e89bdc5a6d7b6d3ff89c0c92fefc9d289568d21d1a281d99d5203707b766ae37c4a89ff4793248e077643bacd9116ef6ea6e6edfe7c30261809d990 SHA512 4eafdad8e473e4def38e4283db924d32f1489992f6a7cd5468bdfa2abda014c397f0fe6c443765e8e0bdbcfe2eddd49cba4659df9174dfb27c6677cd04e7526a
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
similarity index 89%
rename from net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
rename to net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
index 865a87574ece..95113756b22c 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="rpcsvc protocol definitions from glibc"
 HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 # Fake version to help portage upgrading.
 
-SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
 RDEPEND="${DEPEND}"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
similarity index 99%
rename from net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
rename to net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
index 01335e46d021..68a3bdb3e02f 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="rpcsvc protocol definitions from glibc"
 HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index af1d9429835d..60d36d1e2aaa 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7ed1385e2600..91eb332dd940 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -7,6 +7,6 @@ DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f3
 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
 DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150
 EBUILD dovecot-2.3.18-r1.ebuild 8859 BLAKE2B a022d5c3fb0da72559ecd071711ca2bbea7dbd999a75449f7b6e50047d74497895ad00a74de6c0653e61d78f76600d5aab9204133476558ee6c59b1628180438 SHA512 e3c1b3f2733a348344d3349091622b0e3827bdedd4575fef0ada44d13346f22bef33ef9817540c2cc5c15fd6142050a36bfdc32ecf905a64ee67e3283e6c6981
-EBUILD dovecot-2.3.19.1-r1.ebuild 8694 BLAKE2B b27fe6d687c6e6bc0f63c150f301f50bd79a891bd5a9a220c1d0f58615cf284ff5628adae291e6cf1b77a157fbb071eb11e8a13c1055cfe295ab29f1ec105cd2 SHA512 7e44159aca0595d07c60307c1f10d48a628afd779c6a01c3da38ee78ceb0bd4a151b2f8dff296988e8b87cd80944bb368492871f6aacbcd9ceb4ae61d3c30b58
+EBUILD dovecot-2.3.19.1-r1.ebuild 8689 BLAKE2B a02875e7f8404cc3f404b66cfbce96c095c89e5ff83eb65a9104f02d81f524017eed3565bcd4b802ab119387956862dffbfa8e15d13e28e03f612fe09e1ad477 SHA512 b5d45fe0ce376eee7991f737b2e61dccb344683b924d1ec581cdf3d50c736d5a2904e71b332aca0453db17ff66bf796d4b93c2b34817d6a536ab08f016e36b46
 EBUILD dovecot-2.3.19.1.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
 MISC metadata.xml 1025 BLAKE2B 5e9309f0cf659eb51dbf908776fd0f6a97c06c305380ff0b66f969d92382c78e1460310b0d4dd323e1193d622f5bd9cc796d31e8bda304e833d5ab974b934992 SHA512 befdb4837de276d9a73a77a926d972dae9a6c5a39a28137d4ef8f1e9e51c4885b8df24b8a144b9ba5d9533af7430ea531cada49944d529651bf63bc98aeff92f
diff --git a/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
index 402e4f5e814a..9d580a135e17 100644
--- a/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-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_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 08fe22939479..86987d61673c 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,12 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX mu-1.7.12-gcc12.patch 279 BLAKE2B 6b193a92ffbb3d126d39b45c09c4ccc971fe362af9e2621fc6e21e5e697d376f3a21c8e7f3521340d169ba572f9ad857bcd2ef69917650a5e5be0c99fef3aa31 SHA512 59887f801811bc86de2a562ab93304887725421baf7cf878c33bd5bc3b12eca68db951008899b18050c9b597580bc98f676881e58aafdda4af49d20e2fc64d45
-AUX mu-1.7.12-optional-mu4e.patch 1047 BLAKE2B a951fe687e59dc6cfd4266c3c3f18aa6a80e562f3bcd617526fc14c8c076768cff444d683a016100e829d6ee80c11d4701db62bcec3a13e28b40ef9b0d1505fe SHA512 3f79f0c8591170231ca800e6fd4476fa1475aea18ec5b1f6c035c88f6b947755527cfa6674a0b221cbae7808e4841b03aed8bbf56b71f2b68d84fe9c2562c363
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
-DIST mu-1.6.11.tar.xz 870188 BLAKE2B ec2ab4312800e8357b4fc902251708e27968cdde389e2403fca9ad6b1ef5e00154aa018d5a7751ec5372b5ca2be2eb030a9148c0d53f35040f420877d51ca3f3 SHA512 78faa4f9b34827676203ab305797deb96c0c0f9b0e8158e627c9a992bccd9c5708d4a1f5cc93c0b9c7f9a224b047800bd389bf3fceb163aa139ecff0cfa19274
-DIST mu-1.7.23.tar.xz 2136016 BLAKE2B 9b0a27fc07072e52c06d8d4b807a77491d314d4c531799a83b1281ce935b79f5eab3510dc94be98ee0effe86c69379331172cfea3db330b8302d03582f7bf364 SHA512 412789146e4962f670c356576906e5eabc5783dd0fc7d04440146f064877f53b4e948713ed557e97b114a96d7a41b3087a8e3c528b48bb363e68fd0eabfe42fc
-DIST mu-1.8.1.tar.xz 537892 BLAKE2B dda0cdd3a45572000861557b04d8c92c0d61c283c6ace69a034ce209d22dc7e26ea4ac77c6493c505e0c7bcbf47ace82cd82ab20295170b2a986fcccaa0c5df9 SHA512 01b4c349aecf4134c700b6e4b1bc58d1e1360a74feec3f3ee56d1f350c7640b7447bdc35f158ce892427b7b7fbe15cfb00ab28d5aa05b9eaba1d4b4f32e5ed26
+DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
-EBUILD mu-1.6.11.ebuild 1590 BLAKE2B ab43c3330249f7fb9175dcb4f4e47a679efac9491ff184fed07e50e107e0eb73a1e95d269eec56b32fb13ab753ebc0daf884a6a812bc93af1afad204fec19a58 SHA512 1b3f0ba75c9baf1761cb853a2c2142137bceed8b106914b19b9598e0bc7c4644b5f8a5000be793d9f6eb3c4818dc9a777169e77b7e1b6dbfc48b48b3619ba01e
-EBUILD mu-1.7.23.ebuild 2073 BLAKE2B 5f0eae7568d09af9d62a8475c056a0f74b96517372a46cdf81538f1a43bffdfc75fc813cb086cc6f876a2b099e9bdef247e47e54ea9b0868c926e92e3a8497ab SHA512 56cf8c574b242910c1d787bae63ed04bfdf03298f27852baa373b599b087da8816035b55507f29665192f5fc7cb8c8a43cedd6dbcd2f68c9baff6f5522bd5af1
-EBUILD mu-1.8.1.ebuild 2043 BLAKE2B 2122817aade6a310834d42c3f2720424a1506c13497f063794a95b5cd1eca05a0601fb16db335698523e4620bf7d7a2393560cf6fd577210b6646e7a7e32d63b SHA512 a3130bbcafaa38c64168ec87ef82fd23bfb5a2dc83b9b2e8e1de8d3a6ae90aa732fe6d58cfcdc840e0ad634544ea3b2bde6a9148c3ccfa5b0a30b3387134be40
+EBUILD mu-1.8.5.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch
deleted file mode 100644
index f360351e17f4..000000000000
--- a/net-mail/mu/files/mu-1.7.12-gcc12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/djcb/mu/pull/2224 (rebased)
-https://bugs.gentoo.org/839918
---- a/lib/utils/mu-utils.cc
-+++ b/lib/utils/mu-utils.cc
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <iostream>
- #include <algorithm>
-+#include <functional>
- #include <numeric>
-
- #include <glib.h>
diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
deleted file mode 100644
index 0f14bf3249e2..000000000000
--- a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sat, 2 Apr 2022 10:06:21 +0100
-Subject: [PATCH] build: add emacs option
-
-Without this option, mu4e will always be installed when Emacs is
-installed.
----
- meson.build       | 2 +-
- meson_options.txt | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 58ac9002..5f71d766 100644
---- a/meson.build
-+++ b/meson.build
-@@ -174,7 +174,7 @@ subdir('lib')
- subdir('mu')
- subdir('man')
- 
--if emacs.found()
-+if get_option('emacs').enabled() and emacs.found()
-    subdir('mu4e')
- endif
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 0c70826e..34cb0c02 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -29,3 +29,8 @@ option('readline',
-        type: 'feature',
-        value: 'auto',
-        description: 'enable readline support for the mu4e repl')
-+
-+option('emacs',
-+       type : 'feature',
-+       value: 'disabled',
-+       description: 'build mu4e')
--- 
-2.35.1
-
diff --git a/net-mail/mu/mu-1.6.11.ebuild b/net-mail/mu/mu-1.6.11.ebuild
deleted file mode 100644
index 311a0e76b0b5..000000000000
--- a/net-mail/mu/mu-1.6.11.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# On some systems make -n errors out so the default src_test
-	# implementation does not call the tests.  Bug #836782
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.7.23.ebuild b/net-mail/mu/mu-1.7.23.ebuild
deleted file mode 100644
index 39d5cb8ad147..000000000000
--- a/net-mail/mu/mu-1.7.23.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-	"${FILESDIR}"/${PN}-1.7.12-gcc12.patch
-)
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature emacs)
-		$(meson_feature readline)
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.8.1.ebuild b/net-mail/mu/mu-1.8.5.ebuild
similarity index 93%
rename from net-mail/mu/mu-1.8.1.ebuild
rename to net-mail/mu/mu-1.8.5.ebuild
index ef60bb7e559f..af673005c01c 100644
--- a/net-mail/mu/mu-1.8.1.ebuild
+++ b/net-mail/mu/mu-1.8.5.ebuild
@@ -26,10 +26,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-)
-
 SITEFILE="70mu-gentoo-autoload.el"
 
 src_prepare() {
@@ -39,14 +35,17 @@ src_prepare() {
 	sed -i '/NEWS.org/,+1 d' meson.build || die
 	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
 
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
 	# Instead, put it in /usr/share/doc/${PF}.
 	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature emacs)
 		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
 		# NOTE: Guile interface is deprecated to be removed shortly.
 		-Dguile=disabled
 	)
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index c10afe993665..b0a157b07b9a 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,5 +1,3 @@
-DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
-EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
 EBUILD ytnef-2.0.ebuild 663 BLAKE2B b729093667e91ccc8b48f5ee4645b90280ddd256ab32495418f1f47a27ce05e3201b60d619aac79601323be945e7d73dfa3e72a53ca48ac049096dc259d83ffb SHA512 601f592a1c9ed61093841032ee11371af9f52154aa7b48b172374bee8fa03054ac2532e12820ee567e17449ae9639b9b310cf0bd55e0242150c15dde34fe0186
-MISC metadata.xml 250 BLAKE2B 859c75fa76b8d426fcb283cde42da32adc02e6a245e3c79fcc90feca26b4d2ee4d8939210543fef5cd60daee092a035b3b1b57e4bc9593a1698199328f68653e SHA512 6cb2f4b36033a6fb6f249a4698596c4c807e2396f2b0a324ac7577e2fd3fffc32ea44fc363821d25511a7ffdcf0c4e8152f8500a84386cd58696f9552ca16b79
+MISC metadata.xml 340 BLAKE2B d4e3cce4e821eecb26dee071adc1ef002bf649c179975c1b261fc1fc5412e2944365e3e47ea61c9fe064ef9a25b0a553558f397f26d2b9e154ed2d2cabccc872 SHA512 c836ebc7317a5e7dcbce8947f0dbfca2364a911ac374f81f1be8e7d745be59bce72367062f851561dade6fc438fe6c1dda7d6d6782b77e873cc0dbbc5def2b54
diff --git a/net-mail/ytnef/metadata.xml b/net-mail/ytnef/metadata.xml
index fe4e02dd19cb..b90a43458ee9 100644
--- a/net-mail/ytnef/metadata.xml
+++ b/net-mail/ytnef/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Yeraze/ytnef</remote-id>
   </upstream>
diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild
deleted file mode 100644
index 232bf9cb8f1e..000000000000
--- a/net-mail/ytnef/ytnef-1.9.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Yeraze's TNEF Stream Reader - for winmail.dat files"
-HOMEPAGE="https://github.com/Yeraze/ytnef"
-SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND="dev-perl/MIME-tools"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 797189db4182..df3b3c8372fc 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b6fb28643ef9..9cb45c4fda48 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,4 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
-AUX curl-7.82.0-certs-processing.patch 853 BLAKE2B 5e05d6f31a93fd81ee597d88c1adeef97ac805befd2615044ad09d41c4b8c8b69f0689b21c2765c547c1dffa695d18791ee4c9301ae9b9e873621fd74eb6107a SHA512 839f262bec4b3730810a3cc849b571c1f7b9482d1c6f37fed9f56e7c3ccf1e07c0eb91bdf973846162bd0e259973e5dc90581db0a9cc7a808924948894437890
-AUX curl-7.83.0-http2.patch 1109 BLAKE2B f1cfcbcd68e046151e5d61c3d95e92cfdec9e412bc51375f08fcb7af508cea19fe48aabdd817949ecde61f9d6ba10d4051f3fe418ce7ca73326847e4bc6b4b04 SHA512 e98eb9129929bd00b1c8387da3668689b4da77b9641761766cf02f28909da5bad8bd506b59b5ce4cd066262a08341d2fa1d39803233c832e998be9a84ecbcab2
 AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f
 AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch
deleted file mode 100644
index a62c1df20b30..000000000000
--- a/net-misc/curl/files/curl-7.82.0-certs-processing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/curl/curl/issues/8559
-https://bugs.gentoo.org/836629
-
-From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 8 Mar 2022 13:38:13 +0100
-Subject: [PATCH] openssl: fix CN check error code
-
-Due to a missing 'else' this returns error too easily.
-
-Regressed in: d15692ebb
-
-Reported-by: Kristoffer Gleditsch
-Fixes #8559
-Closes #8560
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
-               memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
-               peer_CN[peerlen] = '\0';
-             }
--            result = CURLE_OUT_OF_MEMORY;
-+            else
-+              result = CURLE_OUT_OF_MEMORY;
-           }
-         }
-         else /* not a UTF8 name */
diff --git a/net-misc/curl/files/curl-7.83.0-http2.patch b/net-misc/curl/files/curl-7.83.0-http2.patch
deleted file mode 100644
index ede69a177b98..000000000000
--- a/net-misc/curl/files/curl-7.83.0-http2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/842780, https://github.com/curl/curl/pull/8768
-https://github.com/curl/curl/commit/6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3
-
-From 6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 28 Apr 2022 17:11:50 +0200
-Subject: [PATCH] mbedtls: fix compile when h2-enabled
-
-Fixes #8766
-Reported-by: LigH-de on github
-Closes #8768
----
- lib/vtls/mbedtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index 64f57c5d8321..5f9b87e6b75b 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -815,8 +815,8 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn,
-     if(next_protocol) {
-       infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol);
- #ifdef USE_HTTP2
--      if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) &&
--         !next_protocol[ALPN_H2_LEN]) {
-+      if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LENGTH) &&
-+         !next_protocol[ALPN_H2_LENGTH]) {
-         conn->negnpn = CURL_HTTP_VERSION_2;
-       }
-       else
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 6581c3f696fc..b9067f842579 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -81,5 +81,5 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
 DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
-EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
+EBUILD felix-3.1.3.ebuild 7524 BLAKE2B e8124857b3e2f48ee794d80f61fbfb374e466a1c677331bf5f36ce38c15f8f07ee6f12dd7ec3aad6f646841311758f573b33dbb9ec771ec15e9138814f345294 SHA512 63222c6201fb55cee9b581a791250f45ae526e85ef7a287fe044b48b2105830183ae418f2e3a137f51264a4657d652e02e94e7efab1612485f759d9632466a3a
 MISC metadata.xml 329 BLAKE2B d1519b0d8947e214420ce53c575326e638af2760cf461680650c9f7a2d2ce014bf247c1b65ccc487ecdbf4deb8eb65e8780ba0eecf827aacc36e79a35f71f3ba SHA512 dce6476c97c4da696a941cccfba1f183e237fdddfeba36fdc38a105dd3e1031b28c954a4558d62f24fa437a0cc067f0df1cc839691e6a0f7f678397ce1cb14cf
diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild
index 97d86ba45d4a..33172bc354ba 100644
--- a/net-misc/felix/felix-3.1.3.ebuild
+++ b/net-misc/felix/felix-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -86,7 +86,7 @@ EGO_VENDOR=(
 "k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
 )
 
-inherit golang-vcs-snapshot systemd user
+inherit golang-vcs-snapshot
 
 FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
 
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 66f1ee5b2b38..d94a5237bb32 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,4 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
+EBUILD keychain-2.8.5-r1.ebuild 626 BLAKE2B cc711e15b2939e9019ba8a3c58bc4645ef0d31f02eee15514f93322bc137a4e23f6372ba710b0c59e2e3eb1d2284ad3cf739279727181306428ab5d877ab77f9 SHA512 b2013441f598a56f33672be6177dd895f99d1bf47dcc740a3042b9fe857aa74e0df59da38d38956bc3479abb8031b5ed55ee8c5c41a1d1f6857a2c308771bfc5
 EBUILD keychain-2.8.5.ebuild 637 BLAKE2B 8a6dec9e1536bf5df5cd6ac2e07c816862a9ce5cd85ac40e725b3a8f7b6827a6f31eaa70981fde85d697a29e06a8e08b83bc1d9099d444a293aa63bbec52bc63 SHA512 f6f714cd2f9f55cced05171c046ad88166ee79edfd1b7cf793a6cc02687f91a54f5aa434e0b99450dab94aa2b233cfb8936e4ddd5e2c3b62498bb0d765d3bb4d
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/keychain-2.8.5-r1.ebuild b/net-misc/keychain/keychain-2.8.5-r1.ebuild
new file mode 100644
index 000000000000..3432617c3dee
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="https://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index de16f6460c0e..64e5a3f99a70 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -6,5 +6,5 @@ DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
 DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e
-EBUILD netkit-telnetd-0.17-r13.ebuild 1778 BLAKE2B c5211c7584d8415468584d166c59755d1a14913278f8f0a4c2c76acc1ed88217232e6727b34a1f695d3cc3c271b8fa5179c012591ceeec92dded609c5d0f4e6e SHA512 105b5a685ce80e3572cf7aa32cc2ce1e0fe8c0b17fa49734bc074e44e5d05829d9a21d6712d817c98390067dd547719667d5b0ea62579e142026846252aca6e1
+EBUILD netkit-telnetd-0.17-r13.ebuild 1776 BLAKE2B c8db5790f398c6b8c7da49122918ebb0c464f7ac69d4299c351851972adb18cf9539d4ec4a60bc653c2aafaf4ee9944705434e5fc11ad74583698207f9747ca0 SHA512 8a5d77ba4d6ccb7a3faa3071428099d02c1a717d4154c5c57c930a89bdfcb7e024fed928a86c5defadffd800d3b59b5fcd8eb2080cc126c8d6dd65bc5f901328
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
index 7423dd55a7dc..5f3b97415d93 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 4384ae097a7d..d0dc8cdd94a2 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,3 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-EBUILD pulseaudio-dlna-9999.ebuild 2067 BLAKE2B a43c11f87255006748705f6050518b3876ebc9005b4e3be7741f756f214228c535506d12e5b0edae2dc99878ec9997eb186552308f463b50625f5dbc27e0c36c SHA512 e5f090bfc9e7bf5182d83e45fb81a5322766de05b07047bce9c177c0e1b08df83c6460469969c6142338eb6490c9c27c615644e56a649c9db53ff3f226da5e92
+DIST pulseaudio-dlna-0.6.5-1.tar.gz 712483 BLAKE2B baf1fc94f41c9ac2ca7df5c239ace36b36da4d7a40e30cf19fa630f51a0e94fa44a1ba531943ad5c4425580e4bbe68af1d5de48f5f17163783aab7b471faa72e SHA512 6fd59ac6ff0dfa98baed7a5d929c6f7d9f3539016a6383770895732f7066bc260b3d56751691573d0834a0ee29a6e542ef26e66e48c7a7af97cc84ca23ff5c2d
+EBUILD pulseaudio-dlna-0.6.5_p1.ebuild 1836 BLAKE2B 1b355dbf1fcd98a627b2fce84f55342f403bd4bf756dbeee46da5e4a50b2ec73c4cbeb71fd0a6ffb2f146b9c15ee7a36ecf6ccd9160354c3410b9b7a30d6f67b SHA512 5b15828f051ad7ae26f5be2a8721890283a2f7e63ddce6400c0d63ecbb9c09e03405ec69adb11426cb345e43ac6a8e8149a39269de1689eaf0d8602ad0f1ffa4
+EBUILD pulseaudio-dlna-9999.ebuild 1836 BLAKE2B 1b355dbf1fcd98a627b2fce84f55342f403bd4bf756dbeee46da5e4a50b2ec73c4cbeb71fd0a6ffb2f146b9c15ee7a36ecf6ccd9160354c3410b9b7a30d6f67b SHA512 5b15828f051ad7ae26f5be2a8721890283a2f7e63ddce6400c0d63ecbb9c09e03405ec69adb11426cb345e43ac6a8e8149a39269de1689eaf0d8602ad0f1ffa4
 MISC metadata.xml 341 BLAKE2B 9add00de1558ff7ed828022b6e7818de975fb233b6b821f9c7bded156081dfd5edca2ae3237fa3cd2324aa615c6ed02008727a002ddb7b3331f6dd25a2ffcabc SHA512 58ad5457eb2dd3c0f926f32f40433899b1fe2a0456136d0b37b45ae3628994349bd60984e83388514e58b778b6c070ab99c53673f56bd1b7c03a927f1e4afe42
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
new file mode 100644
index 000000000000..cc609b92ede5
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
+
+if [[ ${PV} == *9999 ]];then
+	EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_p/-}
+
+	SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_P}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
+	gnome-base/librsvg[introspection]
+	x11-libs/gtk+:3[introspection]
+	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
+	|| (
+		|| (
+			media-video/ffmpeg[encode,mp3,opus,vorbis]
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+		)
+		(
+			media-libs/flac
+			media-sound/lame
+			media-sound/opus-tools
+			media-sound/sox
+			media-sound/vorbis-tools
+		)
+	)"
+
+python_prepare_all() {
+	sed -i -e 's/.gz//' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 6fc29c68a643..cc609b92ede5 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit desktop distutils-r1
 
 DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
 
 if [[ ${PV} == *9999 ]];then
+	EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna"
-	EGIT_BRANCH="python3"
 else
-	SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_P=${PN}-${PV/_p/-}
+
+	SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_P}
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
@@ -33,13 +35,13 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
 	gnome-base/librsvg[introspection]
 	x11-libs/gtk+:3[introspection]
+	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
 	|| (
 		|| (
 			media-video/ffmpeg[encode,mp3,opus,vorbis]
@@ -54,20 +56,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 		)
 	)"
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )"
-
 python_prepare_all() {
-	sed -i '/dbus-python/d' setup.py || die
-	sed -i '/notify2/d' setup.py || die
-	sed -i '/docopt/d' setup.py || die
-	sed -i '/pychromecast/d' setup.py || die
+	sed -i -e 's/.gz//' setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 src_install() {
 	distutils-r1_src_install
 
-	domenu "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}"/${PN}.desktop
 }
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index c99bbe87d180..1b376b4a6207 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,7 +1,7 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
 DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.76.ebuild 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
-EBUILD putty-0.77.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
-EBUILD putty-9999.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
-MISC metadata.xml 927 BLAKE2B b16050f046b27ee7798fe2a59f80cb5d0b6e76e0facef049d17b67c955986af99fa16d705ee22bba3282ee968e3b1986fdfead3ba51664e9eacbbb8c0e4dba62 SHA512 6241b2e460a8b7bb195712f3cdd2200984e7e2e185c73e9630badca12ff2e01d345467d97c93d8ba79a801d14eb906fc9dfdbc0ef9c7f411fa2cd33abff752fe
+EBUILD putty-0.76.ebuild 1707 BLAKE2B 5da5dbaf196d105ffcdeac1fba6b49f0be19d69d851bfbb0e79812aabc3573d717a440c693ffd96df62d8290c43581b08130c794f0000ed66c7018bbcc10e038 SHA512 93f499eb5fe6fbf3844cbc8a3c970d5329660d85da134b2811de6f9be0c930951057445cc7e663c91467e4e4646cf4f8e1c11d7f3f4de1ebce5a1ea5295d7161
+EBUILD putty-0.77-r1.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
+EBUILD putty-9999.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
+MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index d1187ee7285b..ba7ec402bc1d 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 	<longdescription lang="en">
 		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 		platforms, along with an xterm terminal emulator. It supports flexible terminal
diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild
index c793525eff4f..49c3ca73ee4d 100644
--- a/net-misc/putty/putty-0.76.ebuild
+++ b/net-misc/putty/putty-0.76.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 SRC_URI="
-	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
+	https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
 "
 IUSE="doc +gtk gtk2 ipv6 gssapi"
diff --git a/net-misc/putty/putty-0.77.ebuild b/net-misc/putty/putty-0.77-r1.ebuild
similarity index 85%
rename from net-misc/putty/putty-0.77.ebuild
rename to net-misc/putty/putty-0.77-r1.ebuild
index a09ae7ae4600..be3a4064accf 100644
--- a/net-misc/putty/putty-0.77.ebuild
+++ b/net-misc/putty/putty-0.77-r1.ebuild
@@ -6,7 +6,7 @@ inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
@@ -17,7 +17,7 @@ fi
 LICENSE="MIT"
 
 SLOT="0"
-IUSE="debug +gtk gtk2 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -37,8 +37,8 @@ DEPEND="
 BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
+	doc? ( app-doc/halibut )
 "
-#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
 
 REQUIRED_USE="
 	gtk2? ( gtk )
@@ -60,15 +60,19 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile all doc
+}
+
 src_install() {
 	cmake_src_install
 
 	doman "${BUILD_DIR}"/doc/*.1
 
-	#if use doc ; then
-	#	docinto html
-	#	dodoc "${BUILD_DIR}"/doc/html/*.html
-	#fi
+	if use doc ; then
+		docinto html
+		dodoc "${BUILD_DIR}"/doc/html/*.html
+	fi
 
 	if use gtk ; then
 		local i
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index a09ae7ae4600..be3a4064accf 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -6,7 +6,7 @@ inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
@@ -17,7 +17,7 @@ fi
 LICENSE="MIT"
 
 SLOT="0"
-IUSE="debug +gtk gtk2 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -37,8 +37,8 @@ DEPEND="
 BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
+	doc? ( app-doc/halibut )
 "
-#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
 
 REQUIRED_USE="
 	gtk2? ( gtk )
@@ -60,15 +60,19 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile all doc
+}
+
 src_install() {
 	cmake_src_install
 
 	doman "${BUILD_DIR}"/doc/*.1
 
-	#if use doc ; then
-	#	docinto html
-	#	dodoc "${BUILD_DIR}"/doc/html/*.html
-	#fi
+	if use doc ; then
+		docinto html
+		dodoc "${BUILD_DIR}"/doc/html/*.html
+	fi
 
 	if use gtk ; then
 		local i
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index fc75ee2c9cbb..f656ed7ee658 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -2,6 +2,8 @@ AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb67161
 AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
+DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
 EBUILD r8125-9.008.00.ebuild 1399 BLAKE2B 59bb8848b09ee1ca476abbfbb156ded1e7cb3961aa287359aff792be2bd0b96b19d74a923ff545c3f6a53427c8536f190ee50d7ba837d5665e1d1e182f677b5c SHA512 45950f83abd6ac72475b58969c3c665eb7aa9fa31e7c6b4ec7aa356e06c58a5c5acc6287c23663a1b24902c8257907c6bb7c333df5370f4fbbc37d36d7a112ac
 EBUILD r8125-9.009.01.ebuild 1185 BLAKE2B b50ff489d98dd5fdf4fa8439c2414a47c71dab9782e3cc0eb052ef833bce84b34ed73dfae16abaaf24fbcaa6b4e9e6e3d4a60653092874c64169e861b80ceae4 SHA512 856ce45440f4e1d47c910588d5f88f85506dcffb01295e868c7033b85289f00fa6d9b2e7727f6c74cf33a7854640da06d4492c8b77cf141c9fb5da4c665b8b9a
+EBUILD r8125-9.009.02.ebuild 1112 BLAKE2B b7c8c255ef0fc6bb698526fcfc029ff46b506062f6d7e335c50c163539c2ef79ef3d40df4228f3f1f19139e339da1ec4ee932ebc446928171a33a5217d313231 SHA512 f50154b223ed5fba7dcb9d91d9302d21e6c3e1bed0710f4969c55432eed14d3c94671f10d343b4261eaabc9f0090d84719769bf04b99536e8a7d9da79a225478
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
new file mode 100644
index 000000000000..9178eeaa64df
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index c6c0ac0b6d5e..40a88770cd2c 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1401,6 +1401,8 @@ DIST rclone-1.53.3.tar.gz 14714224 BLAKE2B 0669bd046484867febe6ae201153540c40ce2
 DIST rclone-1.57.0.tar.gz 15443082 BLAKE2B 35b930d1a2234d3887e046f676850e88c07b2fcddaec3d1f44be52cebe2f79cf76bfb2ecce1081e4f3448be505d0e5eddd98f6481c43c4512cab6f160b50261c SHA512 d0428263b8ee1779f96176574dc17adb73668d56b9dcf6894a0aae4db2990148d785226defa520143df788d4401e1f297faa5c5c645d3c8503c796c06a1d3229
 DIST rclone-1.58.1-deps.tar.xz 201798856 BLAKE2B e739b038953292e78161a40c3bd2753e4172b1e330109a4ad0aa5a10255a165c2ae1a4cbd191aeff3bee98c2b2ffd5c9f142bd290ef41fe0ab560baf43cb9702 SHA512 f40f00da9da7b6535ee1de2a120e047522e50e9341bf30ca8f0b01559621ed7474a59d925a88393600a90120818233eaa45ee44727b12336a7d48f3e2dfe550b
 DIST rclone-1.58.1.tar.gz 15696598 BLAKE2B 601d60c5a1facc18bd6c157bf017ff8c0793fe4ca0bd8e8b719ad457882829919b18085c54a606c8880b60199c50b4a8f8fb7e73ca2c200efa899b8bcb7e0b63 SHA512 104ff2e743374ad3d0f3c517e34ac068d6439445732bc3ce4ffe8fbc13e7d2b4285518e8037c5600589425e001c26e334c7e31d12f9a476af958cb47097c4e00
+DIST rclone-1.59.0-deps.tar.xz 301036992 BLAKE2B f5acc3d1ec96e27a96343712595974827ebdb2a10c4d45bbd323228a47a097f9fdc71d439b0881dbee75a6406015ba5fcaccb616482333dd4c5df1cc32d84bc2 SHA512 41a3edbaeb6da5252f4eeb04cf3eb0ec1882de32c2ae5ffff5a659db6a841446ab756197b20878fc9a7053d687ce05b42ea45c30207cdbb16d8ba8a98256ea38
+DIST rclone-1.59.0.tar.gz 15940750 BLAKE2B d6923e766e78a88714b9ebbc146947421e5c9f327b2a6ea8f173d203e3cc952439408622bdc07a98ceb473131d338ca8246614e808e26085f829c971eccd32fe SHA512 a6cb27687b5d4ca6f2a3597b16d6b00d212bbe0bc8542c399c597bc52d827254d41fa0aa67457677cc4ae53d5b264aef09aaa74d80d5a84e4efe9d40f3042b61
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
@@ -1422,6 +1424,7 @@ DIST storj.io%2Fuplink%2F@v%2Fv1.4.6.mod 500 BLAKE2B 1d766d04067e357df8762c6428b
 DIST storj.io%2Fuplink%2F@v%2Fv1.4.6.zip 122968 BLAKE2B 0b84c24ee6e79338bb7925c2d2728ceac3811cf1e27e5e3553fa9e619199577496c0a1779b25805d4a7a3a06a85425adc497460fc5de814372e0637db0e24142 SHA512 0f4f09a58c0b13898cabd0c5e2460b8f08a31fb28b490a7f5df44a987f6a6a4cec559f2e333c69b8e37b1dca07137c45c3cd74bc84008b1a69e897aafae6ba6b
 EBUILD rclone-1.53.3.ebuild 43482 BLAKE2B 12c4a443fcc7dcf11efe23572f59a65f66731382e99442681ca413007b116c0a566558692ed9fe12143a982bb12693478ab6991b25c79b38fdae4e740eaf9acb SHA512 bb5850a4cf44f0661db46c0a3e4a1ed8bc1358fe832e2fd068036a0f61f8eff1cf9c5bd64406057b7e43c3fd2f1f47b542af039f3de4702acfe7f2c22c349a7b
 EBUILD rclone-1.57.0.ebuild 65784 BLAKE2B 36b63186dfa0a301a61e82aac7237f627c6fb36f15e33cebc69fd6d2f8f395110fe0adc4645238ab4207c0009b4f2fb9164c5b157012494d7281bc32cfa436bd SHA512 b4581d54a1d18cca093b91b4b758f4b57a9f76c7735727eb57f09927640377b23f4cb5e5224eb5c7800c03bbb20bfa3032f6fcd8afcaca36574f9c1b566ee803
-EBUILD rclone-1.58.1.ebuild 1074 BLAKE2B ca47c040ff9a63dc00578909465952c2249f569722fdfe545bce41b08d31eb7a7cb93526cd13d48f992e225371c2d175b533aa83b40cd1f88817bd5f7feaf307 SHA512 cae04594405b3286e63616f8825ba03c86d412d8545e900293ff2894a4901f7ac5bd2eaf9f2302fd39c98dea1b449561558afa435e724b898bda867bd4159a9a
+EBUILD rclone-1.58.1.ebuild 1072 BLAKE2B cdfd9f1736d1b576e91141e5690344f34efc0845a36aff58b16e03b17d44de65932a9f77130b60ef5d2ac0f27ab421f2507a44fb7f61f6151f29b3bc05722cbf SHA512 04b1f91ec637a0e0f0c42b0097f98ee9655d6e0a7df2cde7cfd6a29f04e4356bb10cca5ac033d02c35fe239bde5a053696b930c6c46680c7acaf23262b62d8c1
+EBUILD rclone-1.59.0.ebuild 1074 BLAKE2B ca47c040ff9a63dc00578909465952c2249f569722fdfe545bce41b08d31eb7a7cb93526cd13d48f992e225371c2d175b533aa83b40cd1f88817bd5f7feaf307 SHA512 cae04594405b3286e63616f8825ba03c86d412d8545e900293ff2894a4901f7ac5bd2eaf9f2302fd39c98dea1b449561558afa435e724b898bda867bd4159a9a
 EBUILD rclone-9999.ebuild 43484 BLAKE2B 1e9456708ccaf5b2e510a3d56cd5dd565c089fafb343a739e379572197c5a1460693e2dd6d9b2b0bf1d2f4405f01a922fdd069bff9b39561b73f4536b801eee8 SHA512 f7109a557e3a0ce2073f578f12414795c4d4002965b8d7e9fa6bd401d3afcf796837dd77f27b42bc9801d24fa3252836368be814fc23ec6b1222e17d4eaf5cf5
 MISC metadata.xml 361 BLAKE2B 9543147863f95ab48ae7f30ae94e33460cdae92bb641a5756d0f62f03a23fc56d84fc21a4c3f0d3d4700c585c165219a87bfea9398b03041cde84e3366ddcf1e SHA512 8d536ab26cfb37cf5e56fc73219ec97acf079732c8a521d38b5277d63fbc43931b546c42cfee7672e1fda127d912ad215546a37ac0b28a72a59a9641091a924d
diff --git a/net-misc/rclone/rclone-1.58.1.ebuild b/net-misc/rclone/rclone-1.58.1.ebuild
index 7c77180a06c2..bf443a98d757 100644
--- a/net-misc/rclone/rclone-1.58.1.ebuild
+++ b/net-misc/rclone/rclone-1.58.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 inherit bash-completion-r1 go-module
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 SRC_URI="
 	https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz
diff --git a/net-misc/rclone/rclone-1.59.0.ebuild b/net-misc/rclone/rclone-1.59.0.ebuild
new file mode 100644
index 000000000000..7c77180a06c2
--- /dev/null
+++ b/net-misc/rclone/rclone-1.59.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SRC_URI="
+	https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz
+"
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	go build -mod=readonly . || die "compile failed"
+}
+
+src_test() {
+	# Setting CI skips unreliable tests, see fstest/testy/testy.go
+	# TestAddPlugin and TestRemovePlugin fail
+	RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index c9a55b3b32f5..658eee524372 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,9 +1,11 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
 DIST streamlink-4.1.0.tar.gz 447665 BLAKE2B 18577544c64266bbd013ad90f80b452d0ec8800ba6650acdf30da00997498d3b642873069f64f1445ddfcfdc91d4bd4b64a7f35895ac2685fb01735e7d4f4539 SHA512 f163766bffe079c10cb9f33792ca1e8fa806f46fac64716bada5221f97b6b7b6786f1a218a9ba0ba6ae4eb1b9e5bfc8bf2de1a6b2e5bf9d4c9ba8b11a6a99b9e
+DIST streamlink-4.2.0.tar.gz 452348 BLAKE2B 9e994f2fd526adc5adbe905da5c628afca747184137a6a2d383e99df1dccedfd257c6f2bf9111839e2dff03a81214306f5e387c64f2a9bbc81410d57e15b69d5 SHA512 fccdf623d7b98f80342115d490b3033a3611b25dd79e8f2b46f6e0469e1d8a6370111d2fc6379425e4fd173babceba6f259aa8025d3007d318b618d34131589c
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
 EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
-EBUILD streamlink-4.1.0-r2.ebuild 1513 BLAKE2B 0198953b62784af54a7ed90dd0df1f49abca56d5a014916ec6d477c14cb37fc13e9b1d6fd5d8d1a848284626e53b598c34ccc837601449ba39b61cbc636fe4b7 SHA512 0731859b980472685e657adee6f8a581f733fe78a0fb37638233e26ec95bc84be6e6bcbb1c0c274063d4464c58a4ae6d206370501c1f541bcdaf48d1bbeeae68
-EBUILD streamlink-9999.ebuild 1508 BLAKE2B c5b55bdd15e64d53dd3879e497df337cfa6df0e296df045bf5a9004e0d1a4e7221a0ee888694fc00e13eb02aef443a8ae8288b69a6299a3147c9a37b070309f9 SHA512 1a489584690862d1177e0ac0b4aa792ae10db12e39781f0f26bd8b5966cdbf766fa80126dd2d5f5ab214c9fb42812e6ae402638575d00b24a40e2657d726ce68
+EBUILD streamlink-4.1.0-r2.ebuild 1387 BLAKE2B 361d3a627bdcc29a280cfcf7c809ed7e48b2ca79ff0b5c39bdd9e7a2ed1a806f4074ca1d74b172c5a7851a0e7682c55b9baef1fac331050da6ab9106c6ddec5b SHA512 05f10cae732d49d869e773d547e9876cc9ebfc8bc6e21c2d4aa3e44fc66bf63a1da373095e7b74fe6cf557754f9fea447915ecf2027907295d035a72b4216ca9
+EBUILD streamlink-4.2.0.ebuild 1395 BLAKE2B a85db98bd550c5ab3d157c1c61d010832e0be0dd11d9e3e872cc8043c2ca132cc52f50cda0e9f74862251ae0e6d551474cf557cb2450e96e2ae34181a468ade9 SHA512 7631b8cc4b90d746c9fe8270d20a371440d19abd312ca0f708d6c2ab6c1aff2919cd25db477dd5bf3a9e2dac45a9cd652e16fffc9d10ff9dc2729fa1f15c2657
+EBUILD streamlink-9999.ebuild 1395 BLAKE2B a85db98bd550c5ab3d157c1c61d010832e0be0dd11d9e3e872cc8043c2ca132cc52f50cda0e9f74862251ae0e6d551474cf557cb2450e96e2ae34181a468ade9 SHA512 7631b8cc4b90d746c9fe8270d20a371440d19abd312ca0f708d6c2ab6c1aff2919cd25db477dd5bf3a9e2dac45a9cd652e16fffc9d10ff9dc2729fa1f15c2657
 MISC metadata.xml 331 BLAKE2B 7872b2d59cd70d3f8fe1cad4d41d66a0e0fb5cac22412b7239273d0ab7fe028da8992b8d1113cb3bcb8d04a4486ff60155935bfd4dcb17b412ed4e2ea0db42a2 SHA512 4606169ce928cad0bddfde73fe826ba58c901756e8c23e46b998d1fcf317cad922f0816bb459188a2267fe242239fc330805a493a5a28ab43c58d61d97429a3c
diff --git a/net-misc/streamlink/streamlink-4.1.0-r2.ebuild b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
index 31e03af2cb69..271e7ae62919 100644
--- a/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
+++ b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
@@ -51,8 +51,3 @@ BDEPEND="
 	')"
 
 distutils_enable_tests pytest
-
-python_configure_all() {
-	# Avoid iso-639, iso3166 dependencies since we use pycountry.
-	export STREAMLINK_USE_PYCOUNTRY=1
-}
diff --git a/net-misc/streamlink/streamlink-4.2.0.ebuild b/net-misc/streamlink/streamlink-4.2.0.ebuild
new file mode 100644
index 000000000000..26cf80694fbd
--- /dev/null
+++ b/net-misc/streamlink/streamlink-4.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 1f654f0ef9f0..26cf80694fbd 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
@@ -34,7 +34,7 @@ DEPEND="
 		dev-python/pycountry[${PYTHON_USEDEP}]
 		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
 		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/versioningit[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
 		test? (
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
@@ -51,8 +51,3 @@ BDEPEND="
 	')"
 
 distutils_enable_tests pytest
-
-python_configure_all() {
-	# Avoid iso-639, iso3166 dependencies since we use pycountry.
-	export STREAMLINK_USE_PYCOUNTRY=1
-}
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index b617157a965a..e4b1d7a34138 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -3,4 +3,4 @@ DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e8
 EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5
 EBUILD wget2-2.0.1.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 EBUILD wget2-9999.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
-MISC metadata.xml 719 BLAKE2B 5461e4ca50d06c5f53726d5922ffdf72ca33beb77b093e64b7a0d0d2e62511c815d1aefd1bb0d8f2f066d466ecd11da2e2a3e8cfc3b4923abc20dc6900bbce6e SHA512 7d0ef8c43239610cc56574bcdf7d4b9e52abb9a3dfa39a24ab669ad3ab740587080f913c48311cf518026198d6ac6571dd7f96d8ba24154a64201e0cc5b8d7c0
+MISC metadata.xml 804 BLAKE2B 43c7a55beb1080137f2f5eb8a25dd698230cca2bd2bf32b577350cc4b2d557757313fc8248971f8f4eeaf9d153acf175fa60c8ee8f1120a04db9a307b5d49964 SHA512 4f1a102c817dd7e228aef94856734c387ba6cbb58870ef93c3fe11b1174932f498a8f725c3986b95151f9135e294f5f31bc883d4ae8d8ee2f17773ac011ef875
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index 7d7d6c67e605..64fc07a8328e 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<use>
 		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 7c452a70af44..f7cf2f67a386 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 8128b71bf5f6..122e82f6186d 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,7 +1,5 @@
-DIST mitmproxy-7.0.4.tar.gz 27312748 BLAKE2B a23db472adab33db615b0daa93694211450e8899885dc75601d40a4964cc505437db6a106622eb8051263db23280261134937b6567482dd584eed29cc592e42b SHA512 4224b44e609f84b974b5419c6ceb576845957968c786ee437bffb5fa5df685ce0712d5ef8c402d40c568406242f44692cc7f04037fadd19ecece8b112d73b7ae
-DIST mitmproxy-8.0.0.tar.gz 27902148 BLAKE2B 73ef46fea3a668cb4cf9992e8de969c7ccac78ac84997a82aa59c841d7b5d1dfc6df5a3bd76f910f318c191421a99bb7a24fd53b50e8529968acdae1e934f322 SHA512 abb0855322ca74ef34756db860f491b49057fd8d4fb26ffafc4038e40fe30444c6736fcff7b683e32c21a2d7339ebfeeb6eaf7b9e586b965d191a59eddfe15b6
 DIST mitmproxy-8.1.0.tar.gz 27940706 BLAKE2B 6d4293f30257e88eafea21127d4f499a7734f3d450c07114f83652d73a8aaadf1523737fee96e04b1bd39d47b73263d7f62f177b5c02357b258c898ccc58a9d1 SHA512 47e0924b1fc2999cbc038295dbb43a78eef4120a31c9445aba7b1f31e90aa4d859c5e2665a429f16c5cf7a6f9f29a7d6a50bb09a1e54c2e1693714c28d5153e1
-EBUILD mitmproxy-7.0.4.ebuild 2170 BLAKE2B bcefd4ae98b9dec6093f5e937e70ea3c0284a2e47be80260670712054c530f1d3074fa44a41fd72554ad7da9ca1886b84c7af6bbb1b249f65d73cc10f2a9e7f5 SHA512 a64e9ce2244eaa1e899baa37e2c5bb39ba1deb1dc8d0aa366a1af79381b09fab405d4cb44b3c3505dc3679ec11d1a13db2797489b194751e1b608ffb92be363d
-EBUILD mitmproxy-8.0.0.ebuild 2207 BLAKE2B c7788d0cb1b6f96984eb29566f164ba7e9756a901114c4ae28a0efb140bb85a16e03a91bf27229b336a4305192c51178a1f9c03837e414335daa9d39d24d1a2b SHA512 d60faa509bc7132c3924c6b2fee8eaa6b692b9e3976849ca2fae25dc21f625ac00076aa07461cdeba5a4d53f684cfd9525a6d0048f6247aed38da9a544b56e15
-EBUILD mitmproxy-8.1.0.ebuild 2205 BLAKE2B 88f42abc8e8c97b912f7b8e5e9ef4bca0ff26a75eee3cc77a33d88f31bd618e5cef2fce5997c16240857149533280e2701631a7481b28d0071354897d59d7e26 SHA512 bbedfeb5813a5163f2a0c317f2af5684e4a8d43164b8bc09a5a06f8d0b965b40964037365d149bac813f3515d79ab0de52aecc43756cec73d29c399e634cfdf9
+DIST mitmproxy-8.1.1.gh.tar.gz 27943959 BLAKE2B e920ee016f3c2c1ece08924e895848d6716c60ed65ba3b0b3ac6c966cf4ac4245a31b31365d248f4b88130f787c65183943eec3611db900a4f5c2e16709c775c SHA512 a62a45f8991819202115ab8f43d1c113df88504c494c73917ec2e3c52999dbe3ac596444a4c096619d4285f2e26a91ec715d6894fc4d7768bac1a2c3c4c268bc
+EBUILD mitmproxy-8.1.0.ebuild 2204 BLAKE2B e8ae2b6dc4a77e1f642b9c9ad4b1bb5139b0a96545e45513f8243509aeafcbe24731b460171d635f6124363b3ccfce9eaf6e4bf06611829e4e5ee9b9ff84c848 SHA512 ca90b85197b481a41d8cb0958bb1f936bda17a01b041b16739be266851ed3352edae3ef47ff7198f607a2fab7dc65e44e6d6d628bf2c77a91aec870c77ffb024
+EBUILD mitmproxy-8.1.1.ebuild 2208 BLAKE2B 9bac60f812f36a2077c46cdbc52cf0499967cead89dea2cc25971f80786acd9a0e171f8a8683fdb4aaf9cd4c43d3f8f6303a33714c79582af991986cea2a7719 SHA512 5c2bdbac586ab7af1f9fa73c76c08819256cbd254de2e1ee086108aedf35b653a1ba7ba509c14cc051b0bfa28af88fe3a16649d1c4b694a7162c13d8e0e9705c
 MISC metadata.xml 923 BLAKE2B 00d3790b8e1810b193babedab5b14f35c1275c5d544b4ae031cab41e886bb55130a5187a02a0adab6b00c1ad6d38ba485f9ebd68422549e4e4b62a21b7bcdc13 SHA512 50d52876c7f9d71b2cc31a697cec73c8cce041076c8057e9e3e1f0b2218b883898735f545f85f4e28ab1bd2f8091b764ebc6c92e98c291962cb6f1d52e5aa605
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild
deleted file mode 100644
index 1c941837097b..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
index c30ef41ab876..2bb96ea6369f 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
diff --git a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
similarity index 97%
rename from net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild
rename to net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
index f8b403ee6b30..8c38bade37bd 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9,10} )
 PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
 HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d88d559ca095..14700cf9df34 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 2126bcfb6a7a..6951cae5c512 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -3,5 +3,5 @@ AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 EBUILD i2p-1.6.1.ebuild 4460 BLAKE2B 787d90534c98d4fb6b399151a71bff687d623080f4b102112c1a86471c2e682f8f182b924237207b5cadc92633bc65ddba9bd261ebff02239d46469606002657 SHA512 18463baab09b5b06bf6077df16c70efd1b67731cb6f7a6e11b9d6be3ff574a3190405528476e23709d7cdc7f372025e1d2109a7be242ce527efffb71ad61feda
-EBUILD i2p-1.7.0.ebuild 4310 BLAKE2B 9fea6d6616647951eec0b18826a6132475f3bf1111106de9bce970989c4ae5e323e4b8519d27b2c65c70a213f6597e628801d3ed812cbd8c338a3ee7116fcf84 SHA512 c8c9ea75c7230d61f3883fa252fc51e1018c6ad30f3814b06bdb2ce4c6a9a2452e640dd62a8e6403100a14e4024f711ac904645ba3d18fae1795bd821f60984a
+EBUILD i2p-1.7.0.ebuild 4309 BLAKE2B 7a17e63badb7ddf0acbbfbd28e5edffd602b872797ae96be16ab50aedac9d4eb88244e156798c853ccea567c9bcb23cce0669b4f5913208e365880160e1f0f0e SHA512 93b5cbc1a7bf69ea9efdcda9f2daaee55a66ba84ab6448e01b40dd72e1c0f4621e62669d9674937ad841e3f2c1ff71756f30536c52b722b48f4f6a8f54e06fb8
 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909
diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
index edc82ec59148..9c4491ff3d78 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 79da785eed7b..559e2f7206f4 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a12bf8b6f8ee..9e03bbbbd408 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,5 +5,5 @@ AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b9940
 AUX bluez-5.63-musl-limits.patch 558 BLAKE2B 2dd66c54aee0bd8bfe3fd530a4e29139d79f6eb153e06e13680df42f2a361274d6a8f0f80989b7962173d693f37d1cac8b16506267a1319e608382511cf4bfe1 SHA512 b752414c8219befb71e0f0a59fa33be5a0d2add2b89a0c8f90de13aef1815307e5f4b8f076d3778778ab3de6656fd50d59f621af50d9ed39695b5f7978660348
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583aac01a1a782290a805ee0fd6456b6832c804ad323dd8714fa9329487b2616ed08f1f491ea29403ee05dba2d SHA512 f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd
-EBUILD bluez-5.64.ebuild 9341 BLAKE2B 5f8eb4df0457233494f803f9f589039a9d67b30832b969ddf1ee4ba8ef8165664fc1e100d6611e25b2704ff8eeae2ae360f8ac699f80f0bfd2c5d9a727c2776e SHA512 458c102829f53879e6e537d78d9082e79b7b6622b376445b78d440c23018ad0184ed89049ad93949805fbcfe292c54ee6831f94dd22ece93af46431809f7bdfb
+EBUILD bluez-5.64.ebuild 9384 BLAKE2B 9763e7477924ed3255d85e1f4961e40018b6680b55d6a1eec4afa9c5e35c4e193c67cdb489147d860934d42cbd3da7bd3134eb9f80e85e703d7406b2c637adc1 SHA512 2f40e7a0b95c163c57b579b31b973ee3da519cd3ad4945bd76de674feb070f17cdf134e1b69db00f42ff2a2090deaa5bc78c22679263903f0eaec40b51f2236c
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.64.ebuild b/net-wireless/bluez/bluez-5.64.ebuild
index 739c0968b690..d70099f17051 100644
--- a/net-wireless/bluez/bluez-5.64.ebuild
+++ b/net-wireless/bluez/bluez-5.64.ebuild
@@ -290,3 +290,7 @@ pkg_postinst() {
 	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
 	use mesh && readme.gentoo_print_elog
 }
+
+pkg_postrm() {
+	use udev && udev_reload
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 71d84e92de5a..3ebf47598e86 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,4 @@
-DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
-EBUILD gnuradio-3.8.4.0.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
 EBUILD gnuradio-3.8.5.0-r1.ebuild 6179 BLAKE2B 0a80d18deaf566e360a3ac27f9f9be82b1ca77f863e55f63d33e2db2963be501fbb48ff40d803f517ab9d1d6942f70e1308403283ba02994869c583ce8a798cf SHA512 2cb684eb7e6ed1720789adb1a856b0b789d78973f288c02288ecfce734118f7d5d27feda40816981e9633ee925d23d4252317587941983ef1e6829654ffe4b7e
 EBUILD gnuradio-3.8.5.0.ebuild 6125 BLAKE2B 80ff9f450051087bf7d4801115097ca83423c9bb30149c416141bd09fd6b054d6c19a477a09dac84cbfecda14b731d48265e6be0ad50173bf8f47868b4025eab SHA512 5ec39ebc2b28a720a1c19573ad20ff2e7c4a992e3467c7ac999d47044ad212d6ef88f840dcc5cdf7526153656eba58c159c47a2e13c3c61459170788b9e7c74d
 EBUILD gnuradio-9999.ebuild 5985 BLAKE2B 93ab02962149379a688c3db4db570cddb1da16d87fc4955327a22550f1a17eca6b034a69e28d92bafb1915427d659e4292883b231315ce8ed4f002bc35409465 SHA512 3de04e75f3d94d03d21f353ffcf4d8100520772d1864e4f814a6056cd6a5b10abcf3ee6077d28c6dc3126e6989b7993686a279780c2d3a75ceb66c84c9f07dad
diff --git a/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
deleted file mode 100644
index 9f0a184fbeca..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
+++ /dev/null
@@ -1,222 +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} )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
-	EGIT_BRANCH="maint-3.8"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
-
-#RESTRICT="!test? ( test )"
-#Tests are known broken right now
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	audio? ( || ( alsa oss jack portaudio ) )
-	alsa? ( audio )
-	jack? ( audio )
-	oss? ( audio )
-	portaudio? ( audio )
-	analog? ( filter )
-	channels? ( filter analog qt5 )
-	digital? ( filter analog )
-	dtv? ( filter analog fec )
-	modtool? ( utils )
-	qt5? ( filter )
-	trellis? ( analog digital )
-	uhd? ( filter analog )
-	vocoder? ( filter analog )
-	wavelet? ( analog )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
-	dev-libs/log4cpp:=
-	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
-	sci-libs/fftw:3.0=
-	sci-libs/mpir:=
-	sci-libs/volk:=
-	alsa? ( media-libs/alsa-lib:= )
-	ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
-	fec? (
-		sci-libs/gsl:=
-		dev-python/scipy
-	)
-	filter? ( dev-python/scipy )
-	grc? (
-		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]')
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-	jack? ( virtual/jack )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	qt5? (
-		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		x11-libs/qwt:6[qt5(+)]
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( dev-python/scipy )
-	uhd? (
-		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
-	)
-	utils? (
-		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
-		dev-python/click-plugins[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]')
-	)
-	vocoder? (
-		media-sound/gsm
-		>=media-libs/codec2-0.8.1:=
-	)
-	wavelet? (
-		sci-libs/gsl:=
-		dev-libs/gmp:=
-		sci-libs/lapack
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11:= )
-"
-
-#That's right, it can't build if gnuradio 3.7 is installed
-#Both due to build failure, and then file collision due to bundled volk
-DEPEND="${RDEPEND}
-	!!<net-wireless/gnuradio-3.8
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	xdg_environment_reset #534582
-
-	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
-	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_VOLK=OFF
-		-DENABLE_INTERNAL_VOLK=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_MODTOOL="$(usex modtool)"
-		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="$(python_get_sitedir)"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# Remove duplicated icons, MIME and desktop files and installation script
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	#if use grc ; then
-	#	local fd_path="${S}/grc/scripts/freedesktop"
-	#	insinto /usr/share/mime/packages
-	#	doins "${fd_path}/${PN}-grc.xml"
-
-	#	domenu "${fd_path}/"*.desktop
-	#	doicon "${fd_path}/"*.png
-	#fi
-
-	python_fix_shebang "${ED}"
-	# Remove incorrectly byte-compiled Python files and replace
-	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
-	python_optimize
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-pkg_postinst() {
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3b632c9ce041..b7ccd0a5319d 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index de7ba0224b4d..f8d75f42430c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
 # media-libs/libjxl is not keyworded
 # bug https://bugs.gentoo.org/853628
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index bea0fbe50af9..73346775f658 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -305,6 +305,7 @@ media-gfx/xsane ocr
 # MMAL is available on the Raspberry Pi (armv6 & armv7 so far)
 media-video/ffmpeg -mmal
 media-video/ffmpeg-chromium -mmal
+media-video/mpv -mmal
 
 # Markus Meier <maekke@gentoo.org> (2015-10-10)
 # unkeyworded deps, bug #552330
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index da1c3ffe1cc5..7e87677f4ecd 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
+# Sam James <sam@gentoo.org> (2022-07-08)
+# Unmask galera for dev-db/mariadb
+>=dev-db/mariadb-10.1.0 -galera
+
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-06-25)
 # Unkeyworded test dep
 app-vim/jedi test
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index b48fcbc39715..ebd32a44985b 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -237,10 +237,6 @@ app-admin/rsyslog imhttp mdblookup
 # https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html
 dev-lang/ocaml spacetime
 
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-30)
-# media-libs/raspberrypi-userland not keyworded
-media-video/motion mmal
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2017-01-04)
 # Mask assembly optimisations that are platform-specific
 dev-libs/libsecp256k1 asm
@@ -283,8 +279,10 @@ media-video/mpv raspberry-pi
 # Alexis Ballier <aballier@gentoo.org> (2015-11-14)
 # MMAL is only available on the Raspberry Pi:
 # Mask it globally, unmask it on arm.
+media-video/motion mmal
 media-video/ffmpeg mmal
 media-video/ffmpeg-chromium mmal
+media-video/mpv mmal
 
 # Brian Evans <grknight@gentoo.org (2015-09-14)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 804f970f43a9..ace034545eeb 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
 # media-libs/libjxl is not keyworded
 # bug https://bugs.gentoo.org/853628
diff --git a/profiles/arch/loong/package.use b/profiles/arch/loong/package.use
new file mode 100644
index 000000000000..77df43ba64a2
--- /dev/null
+++ b/profiles/arch/loong/package.use
@@ -0,0 +1,2 @@
+# LoongArch systems boot with EFI
+sys-boot/grub:2 grub_platforms_efi-64
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 426f9a60cb10..d29bb7e6d3cc 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-07-08)
+# virtual/jre is not available on loong yet.
+www-client/chromium js-type-check
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
 # Fails testing at least with libssh-0.9.6 and mbedtls-2.28.0-r1, needs
 # investigation.
diff --git a/profiles/arch/mips/mips64/n32/use.mask b/profiles/arch/mips/mips64/n32/use.mask
index f7b892f37bcd..ef8c72c5ca0b 100644
--- a/profiles/arch/mips/mips64/n32/use.mask
+++ b/profiles/arch/mips/mips64/n32/use.mask
@@ -1,7 +1,4 @@
-# Copyright 2014-2022 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n32
-
-# bug 850151
-python_targets_python3_11
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/package.mask b/profiles/arch/mips/mipsel/mips64el/n32/package.mask
deleted file mode 100644
index fa019d7c4fd8..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/n32/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# bug 850151
-dev-lang/python:3.11
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/use.mask b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
index f7b892f37bcd..ef8c72c5ca0b 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
@@ -1,7 +1,4 @@
-# Copyright 2014-2022 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n32
-
-# bug 850151
-python_targets_python3_11
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 7a09c8b58c7c..ad2af47f8aa4 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Jimi Huotari <chiitoo@gentoo.org> (2022-05-08)
 # Not keyworded here yet.
 lxqt-base/lxqt-meta desktop-portal
@@ -142,10 +146,6 @@ net-analyzer/snort open-appid
 # Incomplete support, bug #605878.
 net-vpn/tor seccomp
 
-# Robin H. Johnson <robbat2@gentoo.org> (2016-11-18)
-# dev-lang/luajit lacks ppc64 keyword. luajit upstream does not support ppc64
-dev-db/redis luajit
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2016-08-01)
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6298a47b94a1..72517fbad896 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Matt Turner <mattst88@gentoo.org> (2022-06-25)
 # net-libs/libqrtr-glib not keyworded
 net-misc/modemmanager qrtr
diff --git a/profiles/package.mask b/profiles/package.mask
index 07bf31c5be30..e4ea5fe4ad5e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-07-10)
+# The original package was discontinued in 2015.  This is a fork that
+# lived for two months in 2017, and is not name-compatible with
+# the original.  The last revdep was removed in 2018.
+# Removal on 2022-08-09.  Bug #857252.
+dev-python/pydispatcher
+
 # David Seifert <soap@gentoo.org> (2022-07-07)
 # Broken by recent fix attempts, bug #856811.
 >app-emulation/virtualbox-6.1.34-r1
@@ -238,13 +245,6 @@ dev-python/editdistance-s
 # w/ no hope of them being upstreamed. Bug #850958.
 dev-cpp/commoncpp2
 
-# Michał Górny <mgorny@gentoo.org> (2022-06-08)
-# pulseaudio-dlna has not seen any upstream activity since 2017,
-# and has had its last release in 2016.  It does not feature a non-live
-# ebuild.
-# Removal on 2022-07-08.  Bug #813990.
-net-misc/pulseaudio-dlna
-
 # Matt Turner <mattst88@gentoo.org> (2022-05-30)
 # libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.
 # Bug #848501
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 574af8b8bf4c..f2f0e1e51032 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2225,6 +2225,8 @@ dev-libs/poco:util - Several utility classes (like logger, timer, config file pa
 dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:cdd - Build the ppl_lcdd program for vertex/facet enumeration accepting the same input format as the programs shipped with sci-libs/cddlib and sci-libs/lrslib
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear program solver that uses sci-mathematics/glpk for its input routines
+dev-libs/qcoro5:network - Build dev-qt/qtnetwork support
+dev-libs/qcoro5:websockets - Build dev-qt/qtwebsockets support
 dev-libs/raft:zfs - ZFS support
 dev-libs/serdisplib:tools - Build optional tools.
 dev-libs/simdjson:tools - Build and install extra command line tools
@@ -3381,6 +3383,7 @@ gui-libs/wlroots:x11-backend - Enable support for handling input/output devices
 gui-libs/xdg-desktop-portal-wlr:elogind - Enable support for rootless session via elogind
 gui-wm/hikari:X - Enable support for X11 applications (XWayland)
 gui-wm/sway:X - Enable support for X11 applications (XWayland)
+gui-wm/sway:grimshot - Install 'grimshot': script for taking screenshots
 gui-wm/sway:swaybar - Install 'swaybar': sway's status bar component
 gui-wm/sway:swaybg - Install 'swaybg': allows to set a desktop background image
 gui-wm/sway:swayidle - Install 'swayidle': idle manager to run commands when user is inactive
@@ -5089,12 +5092,16 @@ media-video/mpv:gbm - Enable Graphics Buffer Manager based EGL video backend
 media-video/mpv:jpeg - Enable support for saving screenshots in JPEG format
 media-video/mpv:libmpv - Build mpv shared library
 media-video/mpv:lua - Enable Lua scripting, OSC (On Screen Controller) GUI and net-misc/youtube-dl hook-script
+media-video/mpv:mmal - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.
 media-video/mpv:opengl - Enable support for various OpenGL-based video backends
+media-video/mpv:pipewire - Enable sound support via native PipeWire backend
 media-video/mpv:raspberry-pi - Enable support for the Raspberry Pi
 media-video/mpv:rubberband - Enable high quality pitch correction via media-libs/rubberband
 media-video/mpv:sdl - Enable media-libs/libsdl2 based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible)
+media-video/mpv:sndio - Enable sound support via media-sound/sndio
 media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv
 media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet
+media-video/mpv:vector - Use function implementations more amenable to vectorization (gives speedup). Made optional in case of bugs.
 media-video/mpv:vulkan - Enable support for various Vulkan-based video backends
 media-video/mpv:zimg - Enable libzimg support (for vf_fingerprint)
 media-video/noad:libmpeg2 - Build support for mpeg2 through media-libs/libmpeg2 rather than using media-video/ffmpeg
@@ -8755,6 +8762,8 @@ www-servers/nginx:rtmp - NGINX-based Media Streaming Server
 www-servers/nginx:ssl - Enable HTTPS module for http. Enable SSL/TLS support for POP3/IMAP/SMTP for mail.
 www-servers/nginx-unit:php7-3 - Support for PHP 7.3
 www-servers/nginx-unit:php7-4 - Support for PHP 7.4
+www-servers/nginx-unit:php8-0 - Support for PHP 7.4
+www-servers/nginx-unit:php8-1 - Support for PHP 7.4
 www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
 www-servers/pshs:qrcode - Enable generating QRCodes for server URL
 www-servers/sniproxy:dns - Enable DNS resolver via net-libs/udns
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 845de6bccdf7..da0f930bf8e8 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index f7450ce0bedb..b768a55b1b99 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,3 +1,3 @@
 DIST rebase-1901.tar.xz 182532548 BLAKE2B 5ac8d26ab057bcd21dc9c57abeb226ac70cfabb156b48a51f820789626257be55bb21c9eb2099e6e55b1cfe3691480df0ec9b3f4b18b50ba2712b986c6d057b4 SHA512 1e3553e59c3520190754cb40bb0900e466d9ffd206e6460d3262a7d7d2af8aab0e28f3e60187665362824fa3730211c0e2119016ce5fed49095f9de46c7f25d4
-EBUILD rebase-1901-r1.ebuild 1082 BLAKE2B 664fe7c05d97d493ed451965467fbcf3a644cca64229c96a8f186e66382de36433c4dbd77430e94ec6a65e3dd411bd5e53562ced6aa386f3b6b2e6b4b6129e67 SHA512 b801b2b467b8107a6e37bc2356ea9f1ef9b8216dd5d10b7f9fe5630eff2aaa900507aaf3a14111c44786d7d4a84bbe7a2d4028c15c378b9a8d600d31c2b46b98
+EBUILD rebase-1901-r2.ebuild 1083 BLAKE2B f9a069d5c66b77b05c72022533ea6b014d99467f44b94667dd16d49507c47a37c414784307cdbbe20fa8540b28f1e9f9c3bd6a61700edff7cddba7db7a91c2d4 SHA512 c1cad2fffbf05027094a9a2d8a2f58b0d749400c69ac6660e7e4ed24fb906c2c5d05214be0626adb318d22b3e44b4bdbf487c8a9b4e83ed7850e8e7e8dc591f8
 MISC metadata.xml 908 BLAKE2B c5b8a6f961e426788c9a6b84d01c468fa7613b52da52bf4ba4d057f0c1966ac1092acd219160e96bc2778673ebe82398471044a34e775ded0a5d72221adf363b SHA512 0c9bc87df88e5485350071b4b219dbf90958de0394444fda093fdef18ede4378c0463b6e81bd48c5c162ae0c581d186c693d3474f895a4e4de59d36c3f5a0588
diff --git a/sci-biology/rebase/rebase-1901-r1.ebuild b/sci-biology/rebase/rebase-1901-r2.ebuild
similarity index 98%
rename from sci-biology/rebase/rebase-1901-r1.ebuild
rename to sci-biology/rebase/rebase-1901-r2.ebuild
index a993a8c2c44a..1b4b75407947 100644
--- a/sci-biology/rebase/rebase-1901-r1.ebuild
+++ b/sci-biology/rebase/rebase-1901-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="emboss minimal"
 RESTRICT="binchecks strip"
 
 BDEPEND="emboss? ( sci-biology/emboss )"
-REPEND="${BDEPEND}"
+RDEPEND="${BDEPEND}"
 
 src_compile() {
 	if use emboss; then
diff --git a/sci-biology/trnascan-se/Manifest b/sci-biology/trnascan-se/Manifest
index 91b866199a43..3fb1acc44f13 100644
--- a/sci-biology/trnascan-se/Manifest
+++ b/sci-biology/trnascan-se/Manifest
@@ -1,5 +1,5 @@
-AUX trnascan-se-1.31-ldflags.patch 973 BLAKE2B 1aeae4e2e5a513caea6eced215e891a42e3ed650d02cf68f3874e20bc5b6b833cb4041ee3cc8fb4fba774143e247908e68f53d4a2b65bd77c32f857366be9621 SHA512 ff677ce9ac3ed9299f6a3bf977642e2a6c300a1b801436bb5d3787968cfe28357a0ec23d0438f0b15c06324cd7e1bbbda590c8fb5574577a3f653779316931df
+AUX trnascan-se-1.31-makefile.patch 5126 BLAKE2B 792cbd1226966c9f518672a730e8476f65cb0b4056b52e5416d43a6a1b5264666ae22fce88e4d7bfcf48d537ac4ec4d26ba8e737e60d31fbbc867de98d4315f2 SHA512 543ea32ed47279f5930485f5406d3b2912cba1df99681b2eb7e5d6df28579f48a07c9aba9ffe46819990543f5dbe69de6b086b8f86ed67de76e174dcc80563c4
+AUX trnascan-se-1.31-portable-perl-shebangs.patch 634 BLAKE2B 8089d6320bce63e560791c62a9baecea1dd1f8e54c618360072463507c73087a6412742669624db0539ec4b1cf2a4db0b6edb9b064eaf67e8ad1c3b77643004e SHA512 a910b02e35cb9dcc94f6f9ec3c44936e0f7faa1ec81d9bf6f397cb516b3bd20ba7cd8e334e452e94302b4254876187c36ec8f94ebb2bd8039c8fc3e1a2b5720f
 DIST trnascan-se-1.31.tar.gz 740960 BLAKE2B 995bfb7ad9f9d46543f15a36134aaec6c27921144c8900a323dbd6152f25e1faa587b5c817dcb8cb838dc1fde8ec7537e5fd6ca8930a4dd1aaadce41c575d651 SHA512 ba55bc8dfa7e5aee9c9a86c135a55b767cda083b74668bd9af4aaaeb693f9c3a17dc8bade5793de12b775564f09fbb861b0ab4f25bf83ccb0954fecd01bb328d
-EBUILD trnascan-se-1.31-r1.ebuild 1182 BLAKE2B 5d912f6e3a9f744f9dcff88f6bfe5d1fe90d874cf0b49ac3e6770f1f4c7e54c6f1e9cf66eef3b4d8d38408e1034c72ba108fd6542029467d6ec76f3372efd661 SHA512 9cbbde359cd3f43a8e1c76fc5eadf7cfdfd27844edf097bf38035918cf7fd773579092dfd57f814e425906496c04aafed7dc95a57b4602ed3a0e0cda74ff7891
-EBUILD trnascan-se-1.31.ebuild 1191 BLAKE2B 8d492f11917a53e478d1f146bd55ee57b2c1ede4b1206fc419f86fd9acc1f73c30459b159836f8b0c946161cee16ba0cf0131d2635ce67708bd70c56c682f194 SHA512 d79fa9d244d4f3ab98fff94aca074bd23cc953c0b812a270daca2e80c440fcdcfd38e92cba2eea6ccd2ad9873c8fb898f46b9f4356c638d01fa0f2b21e23c55b
+EBUILD trnascan-se-1.31-r2.ebuild 925 BLAKE2B c3903dc93120d03a61d02efaae2ba9fff10cc0e804ea70f03b9ac86b9935b58721a319c0e51a452190444b91942192415d8c2406883aaca6fa07881d628b1f55 SHA512 fe165c6732fe579e739fdff25738ea8996974ef41cf927452aa51a91cfba1dc7485b6172adc81bb583fef442d44f5414c4ac2608b214dfc1c315c97799eb140f
 MISC metadata.xml 602 BLAKE2B 8f0a2a924d5e25b00f3850b903de327eff6811931047cd282386837db9d7905fa0a384b36821aea7c869d5da38969a6efbb43c3f1fd1d82dba50919bdda64172 SHA512 ace918d99f937c74013b854b34eaaeb0404dab2e5e9c21bcf876b471a617db7008cd1a7062a83dd00ba3e69027391a0b81915be8560a10d3ff9062c21862c0c2
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.31-ldflags.patch b/sci-biology/trnascan-se/files/trnascan-se-1.31-ldflags.patch
deleted file mode 100644
index f28b1e8f6bb0..000000000000
--- a/sci-biology/trnascan-se/files/trnascan-se-1.31-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 53e5c5b..a2d3feb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -109,17 +109,17 @@ MPOBJ = mpviterbi.o mp-dbviterbi.o
- all: 	$(PROGS) tRNAscan-SE setpaths
- 
- covels-SE:  $(OBJ) scan_main.o
--	$(CC) $(CFLAGS) $(RFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
- 
- coves-SE: $(OBJ) score_main.o
--	$(CC) $(CFLAGS) $(RFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
- 
- eufindtRNA: $(SQUIDOBJ) pavesi.o eufind_main.o
--	$(CC) $(CFLAGS)  -o eufindtRNA eufind_main.o \
-+	$(CC) $(CFLAGS)  $(LDFLAGS) -o eufindtRNA eufind_main.o \
- 	pavesi.o $(SQUIDOBJ) $(LIBS)
- 
- trnascan-1.4: trnascan.o
--	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4 trnascan.c
-+	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" $(LDFLAGS) -o trnascan-1.4 trnascan.c
- 
- tRNAscan-SE:
- 	$(PERLDIR)/$(PERLBIN) checkversion.pl
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.31-makefile.patch b/sci-biology/trnascan-se/files/trnascan-se-1.31-makefile.patch
new file mode 100644
index 000000000000..acf3c2a6d862
--- /dev/null
+++ b/sci-biology/trnascan-se/files/trnascan-se-1.31-makefile.patch
@@ -0,0 +1,140 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,9 +20,9 @@
+ PERLBIN = perl
+ 
+ ## where you want things installed
+-BINDIR  = $(HOME)/bin
+-LIBDIR  = $(HOME)/lib/tRNAscan-SE
+-MANDIR  = $(HOME)/man
++BINDIR = $(EPREFIX)/usr/bin
++LIBDIR = $(EPREFIX)/usr/share/trnascan-se
++MANDIR = $(EPREFIX)/usr/share/man
+ 
+ ## NOTE !!  If you later manually move the location of 
+ ## binaries or data files in the BINDIR or LIBDIR directories,
+@@ -33,10 +33,8 @@
+ TEMPDIR = /tmp
+ 
+ ## your compiler
+-CC = gcc	  # GNU cc (if available) otherwise use vendor's cc
+ 
+ ## any special compiler flags you want
+-CFLAGS = -O    # ok for most machines (remove -O for DEC OSF/1 cc compiler)
+ 
+ ## machine specific definitions
+ #  You shouldn't need any. The specific #define's in squid are historical.
+@@ -58,7 +56,7 @@
+ #######
+ 
+ SHELL  = /bin/sh
+-LIBS   = -lm
++LIBS   += -lm
+ .SUFFIXES : .c .o
+ 
+ DOCS = README MANUAL INSTALL COPYING GNULICENSE FILES Release.history
+@@ -109,20 +107,20 @@
+ all: 	$(PROGS) tRNAscan-SE setpaths
+ 
+ covels-SE:  $(OBJ) scan_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
+ 
+ coves-SE: $(OBJ) score_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
+ 
+ eufindtRNA: $(SQUIDOBJ) pavesi.o eufind_main.o
+-	$(CC) $(CFLAGS)  -o eufindtRNA eufind_main.o \
++	$(CC) $(LDFLAGS) $(CFLAGS) -o eufindtRNA eufind_main.o \
+ 	pavesi.o $(SQUIDOBJ) $(LIBS)
+ 
+-trnascan-1.4: trnascan.o
+-	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4 trnascan.c
++trnascan-1.4: trnascan.c
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4 trnascan.c
+ 
+ tRNAscan-SE:
+-	$(PERLDIR)/$(PERLBIN) checkversion.pl
++	$(PERLBIN) checkversion.pl
+ 	sed 's#/tmp#$(TEMPDIR)#g' tRNAscan-SE.src | \
+ 	sed 's#bindir = ""#bindir =\"$(BINDIR)/"#g' | \
+ 	sed 's#/usr/local/lib/tRNAscanSE#$(LIBDIR)#g' | \
+@@ -200,11 +198,11 @@
+ noambig: trnascan-1.4-NA eufindtRNA-NA
+ 
+ trnascan-1.4-NA:  trnascan.o
+-	$(CC) $(CFLAGS) -DNO_AMBIG -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4-NA trnascan.c
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -DNO_AMBIG -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4-NA trnascan.c
+ 
+ eufindtRNA-NA: $(SQUIDOBJ) eufind_main.o
+-	$(CC) $(CFLAGS) -DNO_AMBIG -c -o pavesi-NA.o pavesi.c 
+-	$(CC) $(CFLAGS) -o eufindtRNA-NA eufind_main.o \
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DNO_AMBIG -c -o pavesi-NA.o pavesi.c 
++	$(CC) $(LDFLAGS) $(CFLAGS) -o eufindtRNA-NA eufind_main.o \
+ 	pavesi-NA.o $(SQUIDOBJ) $(LIBS)	
+ 
+ 
+@@ -220,7 +218,7 @@
+ 	rmdir -ps $(MANDIR)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(MDEFS) -c $<		
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -c $<		
+ 
+ ## programs from Sean Eddy's sequence i/o function library not
+ ## needed for tRNAscan-SE but included for their utility
+@@ -233,16 +231,16 @@
+ 	cp $(UTILS) $(BINDIR)/.
+ 
+ reformat: $(SQUIDOBJ) reformat_main.o
+-	$(CC) $(CFLAGS) $(MDEFS) -o reformat $(SQUIDOBJ) reformat_main.o $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(MDEFS) -o reformat $(SQUIDOBJ) reformat_main.o $(LIBS)
+ 
+ revcomp: $(SQUIDOBJ) revcomp_main.o
+-	$(CC) $(CFLAGS) $(MDEFS) -o revcomp $(SQUIDOBJ) revcomp_main.o $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(MDEFS) -o revcomp $(SQUIDOBJ) revcomp_main.o $(LIBS)
+ 
+ seqstat: $(SQUIDOBJ) seqstat_main.o
+-	$(CC) $(CFLAGS) $(MDEFS) -o seqstat $(SQUIDOBJ) seqstat_main.o $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(MDEFS) -o seqstat $(SQUIDOBJ) seqstat_main.o $(LIBS)
+ 
+ shuffle: $(SQUIDOBJ) shuffle_main.o
+-	$(CC) $(CFLAGS) $(MDEFS) -o shuffle $(SQUIDOBJ) shuffle_main.o $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(MDEFS) -o shuffle $(SQUIDOBJ) shuffle_main.o $(LIBS)
+ 
+ ## other programs in Cove package (below) not needed for
+ ## tRNAscan-SE, but are included for users who wish to apply
+@@ -255,25 +253,25 @@
+ 	cp $(COVE_SUITE) $(BINDIR)/.
+ 
+ covea: $(OBJ) align_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covea align_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o covea align_main.o $(OBJ) $(LIBS)
+ 
+ coveb: $(OBJ) build_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o coveb build_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o coveb build_main.o $(OBJ) $(LIBS)
+ 
+ covee: $(OBJ) emit_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covee emit_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o covee emit_main.o $(OBJ) $(LIBS)
+ 
+ covet: $(OBJ) train_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covet train_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o covet train_main.o $(OBJ) $(LIBS)
+ 
+ covels:  $(OBJ) scan_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covels scan_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o covels scan_main.o $(OBJ) $(LIBS)
+ 
+ coves: $(OBJ) score_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o coves score_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o coves score_main.o $(OBJ) $(LIBS)
+ 
+ structcheck: $(OBJ) structcheck_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o structcheck structcheck_main.o $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(RFLAGS) -o structcheck structcheck_main.o $(OBJ) $(LIBS)
+ 
+ 
+ ## Maspar memory limits
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.31-portable-perl-shebangs.patch b/sci-biology/trnascan-se/files/trnascan-se-1.31-portable-perl-shebangs.patch
new file mode 100644
index 000000000000..187705e8b3a0
--- /dev/null
+++ b/sci-biology/trnascan-se/files/trnascan-se-1.31-portable-perl-shebangs.patch
@@ -0,0 +1,32 @@
+--- a/fasta2gsi.pl
++++ b/fasta2gsi.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # Usage: fasta2gsi.perl <seqfile>
+ # Creates seqfile.gsi
+--- a/instman.pl
++++ b/instman.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # Sean Eddy, Wed Jul 29 15:24:43 1992
+ 
+--- a/sstofa.pl
++++ b/sstofa.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/bin/env perl
+ 
+ 
+ if ($#ARGV < 0) {
+--- a/tRNAscan-SE.src
++++ b/tRNAscan-SE.src
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # --------------------------------------------------------------------
+ # tRNAscan-SE: a program for improved detection of transfer RNA
diff --git a/sci-biology/trnascan-se/trnascan-se-1.31-r1.ebuild b/sci-biology/trnascan-se/trnascan-se-1.31-r2.ebuild
similarity index 55%
rename from sci-biology/trnascan-se/trnascan-se-1.31-r1.ebuild
rename to sci-biology/trnascan-se/trnascan-se-1.31-r2.ebuild
index cbbcb5f0e11e..f35c31b22798 100644
--- a/sci-biology/trnascan-se/trnascan-se-1.31-r1.ebuild
+++ b/sci-biology/trnascan-se/trnascan-se-1.31-r2.ebuild
@@ -14,22 +14,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="dev-lang/perl:="
+BDEPEND="${RDEPEND}"
+
 PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-portable-perl-shebangs.patch
 )
 
-src_prepare() {
-	default
-
-	sed \
-		-e "s:BINDIR  = \$(HOME)/bin:BINDIR = ${EPREFIX}/usr/bin:" \
-		-e "s:LIBDIR  = \$(HOME)/lib/tRNAscan-SE:LIBDIR = ${EPRFIX}/usr/share/${PN}:" \
-		-e "s:MANDIR  = \$(HOME)/man:MANDIR = ${EPREFIX}/usr/share/man:" \
-		-e "s:CC = gcc:CC = $(tc-getCC):" \
-		-e "s;CFLAGS = -O;CFLAGS = ${CFLAGS};" \
-		-i Makefile || die
-
-	perl_set_version
+src_configure() {
+	tc-export CC
 }
 
 src_test() {
@@ -40,14 +34,10 @@ src_install() {
 	dobin covels-SE coves-SE eufindtRNA tRNAscan-SE trnascan-1.4
 
 	newman tRNAscan-SE.man tRNAscan-SE.man.1
+	dodoc MANUAL Manual.ps README Release.history
 
-	dodoc MANUAL README Release.history
-
-	insinto /usr/share/${PN}/
+	insinto /usr/share/trnascan-se
 	doins *.cm gcode.* Dsignal TPCsignal
 
-	dodoc Manual.ps
-
-	insinto ${VENDOR_LIB}
-	doins -r tRNAscanSE
+	perl_domodule -r tRNAscanSE
 }
diff --git a/sci-biology/trnascan-se/trnascan-se-1.31.ebuild b/sci-biology/trnascan-se/trnascan-se-1.31.ebuild
deleted file mode 100644
index cd8dc152d6d2..000000000000
--- a/sci-biology/trnascan-se/trnascan-se-1.31.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions toolchain-funcs
-
-DESCRIPTION="tRNA detection in large-scale genome sequences"
-HOMEPAGE="http://lowelab.ucsc.edu/tRNAscan-SE/"
-SRC_URI="http://lowelab.ucsc.edu/software/tRNAscan-SE.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"/tRNAscan-SE-1.3.1/
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-	sed \
-		-e "s:BINDIR  = \$(HOME)/bin:BINDIR = ${EPREFIX}/usr/bin:" \
-		-e "s:LIBDIR  = \$(HOME)/lib/tRNAscan-SE:LIBDIR = ${EPRFIX}/usr/share/${PN}:" \
-		-e "s:MANDIR  = \$(HOME)/man:MANDIR = ${EPREFIX}/usr/share/man:" \
-		-e "s:CC = gcc:CC = $(tc-getCC):" \
-		-e "s:CFLAGS = -O:CFLAGS = ${CFLAGS}:" \
-		-i Makefile || die
-
-	perl_set_version
-}
-
-src_test() {
-	emake PATH="${S}:${PATH}" testrun
-}
-
-src_install() {
-	dobin covels-SE coves-SE eufindtRNA tRNAscan-SE trnascan-1.4
-
-	newman tRNAscan-SE.man tRNAscan-SE.man.1
-
-	dodoc MANUAL README Release.history
-
-	insinto /usr/share/${PN}/
-	doins *.cm gcode.* Dsignal TPCsignal
-
-	dodoc Manual.ps
-
-	insinto ${VENDOR_LIB}
-	doins -r tRNAscanSE
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index ffe6e3b5ce12..bc6e1903e43f 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 36d061e51d7c..b210544ef1fd 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,8 +1,6 @@
-DIST klayout-0.27.3.tar.gz 57274694 BLAKE2B 131791f7e978a5ffd344d1dab15d0d245d971855d34c995b4f86173f31853f71ec79d089cc2f80a10d318b108cb0f624c9610c9bf51f0bd88f2265e2d8871c97 SHA512 5f3a83cbbdc171acf200a90e4758942e7c3dd4ec66666576c6ecb041326e52a99222992e844d63f939650374a7493f542b1412ada714b6c0271103facb5acaa9
+DIST klayout-0.27.10.tar.gz 57428098 BLAKE2B 3f64ed6a65ec7d2732691594f50d02f160725a3306cd0d0593f8c2b5978d5cf76e004ed3347bb6e9d9473b8e0974bc04de101ec3bf168faf147e6c64c5f0bdcb SHA512 a637b0a0bd1eaa3c858c333791c5592bc8a4dc1db7413b83432d7bedce9ba7e1210c76086a4f39504bc23a11778a45370b86262c88daa579517e1dee940ecda7
 DIST klayout-0.27.7.tar.gz 57348398 BLAKE2B c717d1041e2b2f1ec4835db3861a8c7ff15d2cd703d3424d9219cb0fab06471a6838503c882b841be45c9e1b9280d1f7a099f9824c6e286940d3b44713927974 SHA512 f4b4f3f2216307df5dca3b9c9c4eee5b45e5811a3307f36d3ad759d33beb8cd83880485284492583b891ee8bbf2866cae0ce87b5c5971478d8ad8daad315bb09
-DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4
-EBUILD klayout-0.27.3.ebuild 1871 BLAKE2B 2a905fc85ec4e5a63d46cf2f484f72797d54f2fc8095777bed11104e1b9cbd8a174173451c8afcea60d4e806ac80986cc69b2767b2d897fadceffc36126f3872 SHA512 a7040076ab94067fbf063eece75cab5a0cb5fd0ea7d935d1baf10392063d3cfa4fdb1b2ba8c8b1852a4b155819f8da527b7a746bf9b2b3a946a1a90e1997b216
-EBUILD klayout-0.27.7.ebuild 1872 BLAKE2B 23ab8a4900c1e1354e9f26f0909a6729710ce43327752773bab1406f48e4f7b0383ed3ca0b5203b8f143e600a146e0dc9bb1bd7165e0f875caad8399ee1ba744 SHA512 cf8c25472ce557b9a20421efc551325c44f4ba6d8e778f8716bcdc7738d7a72fa591c4ca4313eca74f7914bac5330a71bd97185c68c2db220fb53cf1beead999
-EBUILD klayout-0.27.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491
-EBUILD klayout-9999.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e
+EBUILD klayout-0.27.10.ebuild 1876 BLAKE2B 848742adea32c7a357a1b01845e3c2a7e1ea1737c921f45889f81993f76818990f0d7b1e52afd858e5eedb91e4051b16a23c37861c42ac466372c546e1861945 SHA512 4ab2ccebe82a09fed9ca3998026c4a371531e7a17bcc6ab66ea149a0f79bfe3719349ec992d4f62203b705889148222752247de85f68eb9f58db5eedcd8abeff
+EBUILD klayout-0.27.7.ebuild 1875 BLAKE2B e3c2fbae2a925f39f4f4b629ae4a8505e00700be028f061bff4e94cdd7341812228a7b6682a42722e3f8bbc5325e9f12da9ed4809c68dfa2e8980df54d6eef92 SHA512 e91ddeb38d6da9db86d33214b3853e8d5f791e32900d455f3a4288c98de9be35d6e8641d8124b1edf644971cf83a836691f01155f9b9ce4ee7894b45843a46e2
+EBUILD klayout-9999.ebuild 1876 BLAKE2B 848742adea32c7a357a1b01845e3c2a7e1ea1737c921f45889f81993f76818990f0d7b1e52afd858e5eedb91e4051b16a23c37861c42ac466372c546e1861945 SHA512 4ab2ccebe82a09fed9ca3998026c4a371531e7a17bcc6ab66ea149a0f79bfe3719349ec992d4f62203b705889148222752247de85f68eb9f58db5eedcd8abeff
 MISC metadata.xml 381 BLAKE2B 604883a849553c3794ea564abbbe12b612ca34e78859c29a7ed0845c103673f4a9c70f92ba8e980d9197a80fe12c065c6b4244bad0ca49070e81432b73cd61d6 SHA512 aef6fefcb173057d5a1db629aa0ab736c1e3cb64f14c1bfe05e90af76c04e44503d1ec621c86ca0de55467ed73a7077fdabf69601ca7a6ab26d4718e309876d7
diff --git a/sci-electronics/klayout/klayout-0.27.3.ebuild b/sci-electronics/klayout/klayout-0.27.10.ebuild
similarity index 94%
rename from sci-electronics/klayout/klayout-0.27.3.ebuild
rename to sci-electronics/klayout/klayout-0.27.10.ebuild
index 01355f2e03c4..75368510a1f8 100644
--- a/sci-electronics/klayout/klayout-0.27.3.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
diff --git a/sci-electronics/klayout/klayout-0.27.7.ebuild b/sci-electronics/klayout/klayout-0.27.7.ebuild
index 40bfbeb1351d..36a5f7cd2663 100644
--- a/sci-electronics/klayout/klayout-0.27.7.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.7.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
diff --git a/sci-electronics/klayout/klayout-0.27.ebuild b/sci-electronics/klayout/klayout-0.27.ebuild
deleted file mode 100644
index 6eb043c6d1be..000000000000
--- a/sci-electronics/klayout/klayout-0.27.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby26"
-# note: define maximally ONE implementation here
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit toolchain-funcs python-single-r1 ruby-ng
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
-else
-	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
-HOMEPAGE="https://www.klayout.de/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	sys-libs/zlib
-	${PYTHON_DEPS}
-	$(ruby_implementations_depend)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-each_ruby_configure() {
-	tc-export CC CXX AR LD RANLIB
-	export CFLAGS CXXFLAGS
-	./build.sh \
-		-expert \
-		-dry-run \
-		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
-		-ruby "${RUBY}" \
-		-python "${PYTHON}" \
-		-build . \
-		-bin "${T}/bin" \
-		-rpath "/usr/$(get_libdir)/klayout" \
-		-option "${MAKEOPTS}" \
-		-with-qtbinding \
-		-without-64bit-coord \
-		-qt5 || die "Configuration failed"
-}
-
-each_ruby_compile() {
-	emake all
-}
-
-each_ruby_install() {
-	emake install
-
-	cd "${T}/bin" || die
-
-	dodir "/usr/$(get_libdir)/klayout"
-	mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
-
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	mv pymod/* "${D}/$(python_get_sitedir)/" || die
-	rmdir pymod || die
-
-	dobin *
-
-	python_optimize
-}
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index fa9d57d2fc67..75368510a1f8 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f6cbbf4bc237..3c098b4384f1 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c77a049c6487..f60640cc8cac 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -8,10 +8,13 @@ DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B b40e2978d0841386b52de1ad08cec862c52aab8c
 DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af32d8f16998f09332a88a53305243313711cc24fe5d028b8edc131ebccda6daf08b5c67d9a2c55fd4e04fe9cee SHA512 2b97e44b9bd84eb43b4c4894b7b6e748522b2f5e8b6cbecc8247fe5ea862795dd44ba2b52934a83688a949805cee4eef9f1aa66360fb831fea3eae956ab0bef3
 DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0ddddfd5aebfcedfbed3e6a7716e SHA512 e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e
 DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99 SHA512 15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b
+DIST gdal-3.5.1.tar.xz 8844808 BLAKE2B 38efbc69a386607b10fbe9d0add14716fec68a48c6df60f618c306a25d824b499c8dab6cc3d9f614b57e2e69352be860fbba683c58b5d82970a346aa9699f111 SHA512 d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc
 DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b SHA512 723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0
+DIST gdalautotest-3.5.1.tar 51005440 BLAKE2B b6c927f35598a406c186fb834befb6941d3665f924dae77e69191e1190a74ba20153ddf14a5e9e9e0b65e70f3496a67ec9ab60fcfce5a62d8b71f5ed54fecc35 SHA512 50bcaf7dc63c8dc7209b3e6915f5cfd0e6fd6721bc741ac13ef13d485ac7ae4fbf2b59c0e856cbe73b5d9fd787da2859037bf9c3264953bb6fbc8dbbe3662308
 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
 EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a
 EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f
 EBUILD gdal-3.5.0-r3.ebuild 6663 BLAKE2B 90012f3cc1e50719569d6511d463874b8f25b9c3b2851b29b59311dce21d9105e8edd6197af84481a08e25a12d179fde606170cef6662a1c2a3332ae9bc98e6e SHA512 3613cb30254c17f1cb9f918bd4909c460a4483e9e88c264004b21a225a148bde0207115453be6d318b8458be9321e040ae07c493b6e78e524551e26dc8caa061
 EBUILD gdal-3.5.0-r4.ebuild 6879 BLAKE2B 7bd435458e65229bdeb871cd30985540588044ec9254f766cec81c58786edfb472df2d8845563a0457741eb7600d3aae0f6230c047abe6b1af3e5d7acef159ba SHA512 0bd2b4e1776bcfa7127d6300d6151702c2d66f7e384f2ee746d269f28d2dfe248db37db626422981b928eb110ea3dec5d7a2814edade458ad313913d75eb0f91
+EBUILD gdal-3.5.1.ebuild 6692 BLAKE2B a8a44e47733f93347ed4945220105df2d3e8c645929a1d72caa30b2288917779ba3098a97564210072683c181d01d65701acb4b9845a7975c6e0797333ad6ea7 SHA512 c6fc38ed6684402f9c030b5f6f893761192019d0301da6dcf2e5bcbc97840580efe1f22902938c677f167f88bf2e28fdc520442d7a59b4dc3fea84acfd0c187b
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.5.1.ebuild b/sci-libs/gdal/gdal-3.5.1.ebuild
new file mode 100644
index 000000000000..1be7580b66bd
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.5.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/31" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+# Tests fail to build in 3.5.0, let's not worry too much yet given
+# we're only just porting to CMake. Revisit later.
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	python? (
+		dev-lang/swig:0
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPO=OFF
+		-DGDAL_USE_EXTERNAL_LIBS=ON
+		-DGDAL_USE_INTERNAL_LIBS=OFF
+
+		# bug #844874 and bug #845150
+		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+		# Options here are generally off because of one of:
+		# - Not yet packaged dependencies
+		#
+		# - Off for autotools build and didn't want more churn by
+		#   enabling during port to CMake. Feel free to request them
+		#   being turned on if useful for you.
+		-DGDAL_USE_ARMADILLO=$(usex armadillo)
+		-DGDAL_USE_ARROW=OFF
+		-DGDAL_USE_BLOSC=OFF
+		-DGDAL_USE_BRUNSLI=OFF
+		-DGDAL_USE_CRNLIB=OFF
+		-DGDAL_USE_CFITSIO=$(usex fits)
+		-DGDAL_USE_CURL=$(usex curl)
+		-DGDAL_USE_CRYPTOPP=OFF
+		-DGDAL_USE_DEFLATE=OFF
+		-DGDAL_USE_ECW=OFF
+		-DGDAL_USE_EXPAT=ON
+		-DGDAL_USE_FILEGDB=OFF
+		-DGDAL_USE_FREEXL=$(usex xls)
+		-DGDAL_USE_FYBA=OFF
+		-DGDAL_USE_GEOTIFF=ON
+		-DGDAL_USE_GEOS=$(usex geos)
+		-DGDAL_USE_GIF=$(usex gif)
+		-DGDAL_USE_GTA=OFF
+		-DGDAL_USE_HEIF=$(usex heif)
+		-DGDAL_USE_HDF4=OFF
+		-DGDAL_USE_HDF5=$(usex hdf5)
+		-DGDAL_USE_HDFS=OFF
+		-DGDAL_USE_ICONV=ON # TODO dep
+		-DGDAL_USE_IDB=OFF
+		-DGDAL_USE_JPEG=$(usex jpeg)
+
+		# https://gdal.org/build_hints.html#jpeg12
+		# Independent of whether using system libjpeg
+		-DGDAL_USE_JPEG12_INTERNAL=ON
+
+		-DGDAL_USE_JSONC=ON
+		-DGDAL_USE_JXL=OFF
+		-DGDAL_USE_KDU=OFF
+		-DGDAL_USE_KEA=OFF
+		-DGDAL_USE_LERC=OFF
+		-DGDAL_USE_LIBKML=OFF
+		-DGDAL_USE_LIBLZMA=$(usex lzma)
+		-DGDAL_USE_LIBXML2=ON
+		-DGDAL_USE_LURATECH=OFF
+		-DGDAL_USE_LZ4=OFF
+		-DGDAL_USE_MONGOCXX=OFF
+		-DGDAL_USE_MRSID=OFF
+		-DGDAL_USE_MSSQL_NCLI=OFF
+		-DGDAL_USE_MSSQL_ODBC=OFF
+		-DGDAL_USE_MYSQL=$(usex mysql)
+		-DGDAL_USE_NETCDF=$(usex netcdf)
+		-DGDAL_USE_ODBC=$(usex odbc)
+		-DGDAL_USE_ODBCCPP=OFF
+		-DGDAL_USE_OGDI=$(usex ogdi)
+		-DGDAL_USE_OPENCAD=OFF
+		-DGDAL_USE_OPENCL=$(usex opencl)
+		-DGDAL_USE_OPENEXR=OFF
+		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+		-DGDAL_USE_OPENSSL=ON
+		-DGDAL_USE_ORACLE=$(usex oracle)
+		-DGDAL_USE_PARQUET=OFF
+		-DGDAL_USE_PCRE2=ON
+		-DGDAL_USE_PDFIUM=OFF
+		-DGDAL_USE_PNG=$(usex png)
+		-DGDAL_USE_POPPLER=$(usex pdf)
+		-DGDAL_USE_POSTGRESQL=$(usex postgres)
+		-DGDAL_USE_QHULL=OFF
+		-DGDAL_USE_RASTERLITE2=OFF
+		-DGDAL_USE_RDB=OFF
+		-DGDAL_USE_SPATIALITE=$(usex spatialite)
+		-DGDAL_USE_SQLITE3=$(usex sqlite)
+		-DGDAL_USE_SFCGAL=OFF
+		-DGDAL_USE_TEIGHA=OFF
+		-DGDAL_USE_TIFF=ON
+		-DGDAL_USE_TILEDB=OFF
+		-DGDAL_USE_WEBP=$(usex webp)
+		-DGDAL_USE_XERCESC=$(usex gml)
+		-DGDAL_USE_ZLIB=ON
+		-DGDAL_USE_ZSTD=$(usex zstd)
+
+		# Bindings
+		-DBUILD_PYTHON_BINDINGS=$(usex python)
+		-DBUILD_JAVA_BINDINGS=$(usex java)
+		# bug #845369
+		-DBUILD_CSHARP_BINDINGS=OFF
+
+		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+		# Commented out: not (yet?) implemented upstream.
+		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
+		-Dtest_avx=$(usex cpu_flags_x86_avx)
+		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
+		-Dtest_sse=$(usex cpu_flags_x86_sse)
+		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
+		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+		#-Dtest_xop=$(usex cpu_flags_x86_xop)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_test() {
+	export GDAL_RUN_SLOW_TESTS=0
+	export GDAL_DOWNLOAD_TEST_DATA=0
+
+	# Two test suites:
+	# 1. autotests (much larger, uses pytest)
+	# 2. Small set of fuzzing tests (no download needed)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: install docs?
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 94669c24657b..3550ae768ac7 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,7 +1,5 @@
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
-DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-4.3.4-r1.ebuild 4985 BLAKE2B 7a6509bcae552683696d0e6cf31e5f03f547038bfaf215809a4f67550ad06c5fcd1e2fe37df689e7c9320c95f222cb873ff0b32cbfc85150a020fe514e5f01b5 SHA512 fbb969ef412db9656ec279d87749bea111280d000e7a2f4a5721fa08e13f7b1d8b4d91ac1412090b8260a5d0f2a40b6942eed6b5ad328b2e0ca4ab9ddc6ed5b7
-EBUILD linux-gpib-4.3.4.ebuild 4797 BLAKE2B 0016f765269875faedfac78d04a99e39860396b5fe01d78487a72f0b12d8b0cf4202ecb1ee5c08dc6be50183a3adeca78af240d3f07203268610213787fc9661 SHA512 f3e020026a4b0b63be4988492f05ad3f27251f9d87b8e56c184a815449448aa45c3806d8c9881892b72c8b1683c8130f271d84427e9f213a593d9774c61a0184
+EBUILD linux-gpib-4.3.4-r1.ebuild 4984 BLAKE2B 6763fe0259a9281776564f82013bb7a27351d8fd68399396e4b9d8096c9aae4e3137ae86cccbf984bc5a03618f6fc0de8f4a9992baa03c6d08a5c2271189e057 SHA512 7d1af7aff13e9aa3b47ead8aca9af0aedad31f1eda985f7fbafb8e19f4cb29199bd65aa3e3a1120cfe9cc015936371dc3d93ba681605744c48e431e66c40133f
 MISC metadata.xml 548 BLAKE2B c976143b910efb6a8920f064f35fdac9cb325ff272aca8a7644511300f4dfe9232c280577a90eae225ca4f88bc2b4cd09d175d4190bc13513d89457f57c9bb52 SHA512 c611a420ab28d623b5b9167bd59c04c2fe27404a7fd85de72a555f99ef8bad4383702482ae808d4eb66014a9e63ca057aa7195748f9c230f0778fcbde07fb71f
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
index 0584a67f9064..84a82c400b76 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-user-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
deleted file mode 100644
index 76557cd82d74..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-perl.patch
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-As the udev rules were changed and refactored in this release it is
-necessary to remove any manually installed pre-4.3.0 gpib udev rules files
-in /etc/udev/rules.d/. The files to remove are:
-\n
-	99-agilent_82357a.rules\n
-	99-gpib-generic.rules\n
-	99-ni_usb_gpib.rules\n
-\n
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index f6081120bd30..1b7391246775 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,5 +1,5 @@
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
 DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2
 EBUILD nlopt-2.6.2-r1.ebuild 2307 BLAKE2B 9c57f104122725bb2660bde7259ff187256d26cffbb4f0bd399acd2b07dcbac522ea4c83ea2196c84a274fe3c188ee61830e0e09d93505a78df1d74618505364 SHA512 858cc72c427ec512c1ef07619fc44230b1b5fe9b1ca68899341a80c13db7a9a1ac82cc8a8dd3d419a832519739ec672361ee3acdb058f31140df9195101fefd9
-EBUILD nlopt-2.7.1.ebuild 1991 BLAKE2B c3e17104cf44dd3a64fe4a3e2bbcc348b27e4e3d465d1098404317d29a836e8ddb5efa3e443edb86b18250efe2668bdf08107406c6bf2ddce957e864f3dd3c73 SHA512 b94a753fcab605f2549f19d348736cef3a0d9017a71af65fec1b81555286b856ec888a7962ece98c67e03b5e16048c737e1643947eaa2fcd6528791640655991
+EBUILD nlopt-2.7.1.ebuild 1989 BLAKE2B 9250bcd302e71a9d261930c8ec91646d5b9981a9aaec70274bc1e2c006f15e40d787c6ba7c7f02fbd31cf9c47144fb7a97017954d9ffe0ca9845a7b6914a479e SHA512 d618cf5a1f7ee9d41e6cc7e9a5756b9fa59668bade2428bbcae8a4f4e782268e095f9dbdeb95eaee0c23aa1c5508f18cdde7b869328063f1becb8c13d278651b
 MISC metadata.xml 1096 BLAKE2B 2b35b6f79c882fbae26b6bc68c75e30b0e2d48f540696cbbc48f06c2686e89a1a5f582d59d2c1ee3b47d5f813f4dbc20cd1d35228c7f968e327e41bb2f1f4da9 SHA512 5776b4b8faa1a6406f1d65bcd9de9ce4087580d98b5c3272804d442905c34d64c6e7d632022425e6e13b12161c94a99906a6196c3624b5b9b4aa1eac6fe9aa1e
diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild b/sci-libs/nlopt/nlopt-2.7.1.ebuild
index 814c7a1440fc..10e6b998d4e3 100644
--- a/sci-libs/nlopt/nlopt-2.7.1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 6fcc4a1563c9..6c83b4c96feb 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -7,6 +7,7 @@ AUX rocBLAS-4.3.0-remove-problematic-test-suites.patch 2240 BLAKE2B bdaf0111083e
 AUX rocBLAS-4.3.0-unbundle-Tensile.patch 863 BLAKE2B 223d7b54d61111443c9f90d66a2d53bc85414094a2b9c571d2e6fafc0d1260befb0783d6c761d4df0b22c31a4e85a029f5eed5d9d455488207791fdaa1c69952 SHA512 40e7cc604139b419b9a77ad1005a8bbfd1134909f2e0be67579dcc958d49c8239b1b7f573741c9ff04e310977fafbd2edce5b58f4bc4bffb2cd003e7fbab7437
 AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a
 AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88
+AUX rocBLAS-5.0.2-respect-makeopts.patch 3409 BLAKE2B dc97390feba6ab3900ec18fd7b86d4bb25baff4565ccddf0dae025ab5fa8330f16a2dddb1055c32be7132581e9aa1a83ff1e3c77cc69f5f6c641c1e40447fffc SHA512 63ffde4f98f3f3e2d72e11f3877640b2b525c25e8730b3497be97d71dae4b2f9b08c351f548356c9011c1767d5a451badd790963d773a45946994a48e5810b29
 AUX rocBLAS-5.0.2-unbundle-Tensile.patch 1352 BLAKE2B 48300030abee9898397919cbbea187fd16d770e20cdcfddd7665c160f47e362ad63acf9f443f86d824a999398d0c6f5aee8295a963dce2653bc94518c8ac9674 SHA512 39c4aff4fc60692e0450aa844ce979afe031c3ba3adb0cdf0866d0766714bf28a4c5664c18de7520b63d3fc2864de51939a596e864e97d0b8935681cabd7a84d
 DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
@@ -14,5 +15,5 @@ DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e1
 DIST rocm-rocBLAS-5.0.2.tar.gz 13295178 BLAKE2B e1abfa06b9ac1545732465857839dae3f3708af49439a306a2b5b1b1b392101c38c95815f2c05a0d9ed29d41b154bc2e16a4f9203a37f5e2f68ee12cc4b44a06 SHA512 2f4a74f49350ede0debcf32229a6b6b95505615723c3f2bee16e4c169a3bb966dfb1971819028f47c525f571bea5662b892e63f655b0d1d2b8f20746bc5fe770
 EBUILD rocBLAS-4.3.0-r1.ebuild 3897 BLAKE2B 3100406bc65c2292c5b444760bb73bff4804181405d1a174397191ea31f41e8ecebe050bb2bee060a5be344ea5e514c0acde028f8fc483879dbff8b504a69454 SHA512 aab616bb0662c7983c0edd25fb12d79687c9c5f9b6552ac758156b756e8d4db764c50dd6534c92f02be0ba7ff45904586976d0918626b3ebb0d791d38445ec70
 EBUILD rocBLAS-4.3.0.ebuild 4226 BLAKE2B 0e4814b92bf97e230dee8ff54565ca718d2482d12e3f31d194e6321a55b064f3653059dfef623d665ac5d25fadad20a8bca81ace83980c3ee8f5e62cb5c4cd24 SHA512 06528ef0cf5767ed0b9bc58794cddebfc7e247091ff78c4e0e8eeb8f75ed3cdfd5443044671837f9573cf0e576d8006ef6a7c1a96786f5d4a8f06657c5b6308c
-EBUILD rocBLAS-5.0.2.ebuild 3732 BLAKE2B 75d6f4aad5aef0d4db271782f6b80a95c9a99404370e92a681e676810d00f904446fa161b0d101dd9823346b00307e1c50fb43d8d1c17f0a9a6a373fefd0fe0d SHA512 87210ab8f9eb45bcdacf4be4864e2b4dc3f55327f97190a08355250f1e21ffa23303f462d2428ce473b2a646c9595566f14bf3c0474b90b975ffdce9bcb2eecd
+EBUILD rocBLAS-5.0.2-r1.ebuild 3850 BLAKE2B 22a97a83a809a2e927296c75f93b194e4b1cfd15330b70d200434f5464a7ecace665b1c172f480356c34cb856e3f55ff69fe754903bec60543d0600c5d700413 SHA512 6b2fe80de74ad6ac021cd006ecc4ede7a4bfe40f2ce1e3486607de20281efa785c519c855d45abfd131ab8ca3b69538e4a2a4e46c1d7ea4d0a0bf30552d12385
 MISC metadata.xml 654 BLAKE2B b8a1d40e2ccc2aadccb9a1200e9c78fccb37544fa01c353645372a4ed01a6d153c04ff5d0d96cd7661e80b09eb6c69e8cbc59e466fef117ea1ad5ef54b1334ae SHA512 b880f8f495aee8c337b7cac4054a30f877a1204d0cda03fa90aaa25e4ae163d435c113141f2afef62967f603dea372419b228655e1b26fff53c010c8efdcebf1
diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch
new file mode 100644
index 000000000000..649a98106646
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch
@@ -0,0 +1,73 @@
+Only retain CMakeLists patch. We don't need install.sh, rmake.py
+Suggested-By: Alessandro Barbieri <lssndrbarbieri@gmail.com>
+================================================================
+From 0ffee0626bf987bae6b81183a5c61569a489537a Mon Sep 17 00:00:00 2001
+From: Torre Zuk <42548444+TorreZuk@users.noreply.github.com>
+Date: Thu, 4 Nov 2021 09:21:37 -0600
+Subject: [PATCH] Swdev 309014 add jobs arg (#953)
+
+* adds -j --jobs argment passing of cpu_threads for build
+---
+ CMakeLists.txt             |  1 +
+ install.sh                 | 16 ++++++++++++----
+ library/src/CMakeLists.txt | 34 +++++++++++++++++++++++++---------
+ rmake.py                   | 29 ++++++++++++++++++-----------
+ 4 files changed, 56 insertions(+), 24 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69cf8d586..40d88ea0a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,6 +244,7 @@ if(NOT SKIP_LIBRARY)
+     set( Tensile_CODE_OBJECT_VERSION "V2" CACHE STRING "Tensile code_object_version")
+     set( Tensile_COMPILER "hipcc" CACHE STRING "Tensile compiler")
+     set( Tensile_LIBRARY_FORMAT "msgpack" CACHE STRING "Tensile library format")
++    set( Tensile_CPU_THREADS "" CACHE STRING "Number of threads for Tensile parallel build")
+ 
+     option( Tensile_MERGE_FILES "Tensile to merge kernels and solutions files?" ON )
+     option( Tensile_SHORT_FILENAMES "Tensile to use short file names? Use if compiler complains they're too long." OFF )
+diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
+index 4f5e4572d..dedfe9794 100755
+--- a/library/src/CMakeLists.txt
++++ b/library/src/CMakeLists.txt
+@@ -58,15 +58,31 @@ if( BUILD_WITH_TENSILE )
+ 
+   # Add a build target for Tensile kernel library
+   # Runtime language is HIP by default
+-  TensileCreateLibraryFiles(
+-    "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
+-    "${PROJECT_BINARY_DIR}/Tensile"
+-    ARCHITECTURE        ${Tensile_ARCHITECTURE}
+-    CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
+-    COMPILER            ${Tensile_COMPILER}
+-    LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
+-    ${Tensile_Options}
+-  )
++  # warning our Tensile_ variables may shadow variable in TensileCreateLibraryFiles
++  # thus bypassing the function argument parameter system (mainly the options list) and CPU_THREADS
++  if(Tensile_CPU_THREADS MATCHES "^[0-9]+$")
++    # only including threads argument if number
++    TensileCreateLibraryFiles(
++      "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
++      "${PROJECT_BINARY_DIR}/Tensile"
++      ARCHITECTURE        ${Tensile_ARCHITECTURE}
++      CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
++      COMPILER            ${Tensile_COMPILER}
++      LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
++      CPU_THREADS         ${Tensile_CPU_THREADS}
++      ${Tensile_Options}
++    )
++  else()
++    TensileCreateLibraryFiles(
++      "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
++      "${PROJECT_BINARY_DIR}/Tensile"
++      ARCHITECTURE        ${Tensile_ARCHITECTURE}
++      CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
++      COMPILER            ${Tensile_COMPILER}
++      LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
++      ${Tensile_Options}
++    )
++  endif()
+ 
+   # Create a unique name for TensileHost compiled for rocBLAS
+   set_target_properties( TensileHost PROPERTIES OUTPUT_NAME rocblas-tensile CXX_EXTENSIONS NO )
diff --git a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
similarity index 95%
rename from sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild
rename to sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
index 0600f90bac37..42637150e674 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_DIR="docs"
 DOCS_DEPEND="media-gfx/graphviz"
-inherit cmake docs prefix
+inherit cmake docs multiprocessing prefix
 
 DESCRIPTION="AMD's library for BLAS on ROCm"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/rocm-cmake:${SLOT}
-	dev-util/Tensile:${SLOT}
+	>=dev-util/Tensile-${PV}-r1:${SLOT}
 "
 
 DEPEND="
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch
 	"${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch
 	"${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch
+	"${FILESDIR}"/${PN}-5.0.2-respect-makeopts.patch
 	)
 
 src_prepare() {
@@ -85,6 +86,7 @@ src_configure() {
 		-DBUILD_CLIENTS_SAMPLES=OFF
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DTensile_CPU_THREADS=$(makeopts_jobs)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
 	)
 
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index b12cbff2f402..76dc0b001e7a 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -5,6 +5,6 @@ DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017
 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
 EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2
-EBUILD rocFFT-4.3.0-r1.ebuild 2798 BLAKE2B c4e243674c4eded667cce3d3e2e4a9f1a612e0e62e699e23a3afc3482e6b1b82038a9de253748220da8c0a01bde66bada55b9a5514a2cc9688e015dcd4d91915 SHA512 fb9f81f734cb7919f63640c04e399608a84dc2864dc51f415f886b684b27d68ac6b9b504961f7bf3ae9e1533cbca7e7a4182a3def9d0f85e78ba13b13a94d306
-EBUILD rocFFT-5.0.2.ebuild 3990 BLAKE2B 6d7109e8378a68de6a95d56f61baf2b8322ce512ee3d24bec92228b17b9e42e399e3f4ebff26f079025d95d5debb43450526670810c6a91fea821bf07e166928 SHA512 54f3a877fa12d3d3cf1716135447fa48b3cfcd17c54f93433d2b940b58380f1b57c7252e3c541d8d969df688ec0f965381fbe20d0a300c9d14f1b5085a46e148
+EBUILD rocFFT-4.3.0-r1.ebuild 2815 BLAKE2B 048cac2df33144519cf7b61f59887ea7ced86fc8234076bd3c4c50257d0af1bc86b57080beb88442ad830fcaafb5c169ff04c8ec99e7ade6eaf5fcde61e39b9e SHA512 caaba36af9e4c8a98029ff6fbf29282227824a4361544f5a7049ab6a40449dd1f9f4c39ea4429f151587fa99d518aed77a0c42cb6c415495892b994af44137a6
+EBUILD rocFFT-5.0.2.ebuild 4018 BLAKE2B 129baab0c8ddeec9d234fab16523bf882056cac268b370d9e74e1124e74bef8cf039627ee1019193cbfb3c8d863eb98c6c45a75442fe3b61079b290a3ecff920 SHA512 87d77953044378aeae0f3413b5428efa7e28c51a52de51ad8336abef4158add502528ece9a003d76ae16081596d2ea8f5c6bffe3978e2d449a68bbd32a4207fe
 MISC metadata.xml 791 BLAKE2B d61b1f8788dd0d531aebd0b3273072a1ef2cd2e13423dd3b040cb077a6f12b2790a22159c339f98ce4ee93ee674db83390066a05d93d23e6de9dd47283a59ac7 SHA512 a33e10d3fcb784a75bf2b1d3ecddd53cf80328c37a6829202c7b74001338a2a10bdb122ce7aea65c68315e3985a890889b833cd65f4d1fb14bbf6d9bd59752e8
diff --git a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
index 5ebefcf5435f..b9dcb25f7acd 100644
--- a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
@@ -22,9 +22,9 @@ DEPEND="${RDEPEND}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3
+	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
-)"
+"
 
 CHECKREQS_DISK_BUILD="7G"
 
diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
index 8d0cb72d3ed8..bd101fb2e922 100644
--- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
@@ -33,10 +33,10 @@ DEPEND="dev-util/hip:${SLOT}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3
+	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
-	dev-util/rocm-cmake:${SLOT}
-)"
+	>=dev-util/rocm-cmake-${PV}-r1:${SLOT}
+"
 
 CHECKREQS_DISK_BUILD="7G"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e953160e6a7b..3a24b0f2d8d5 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 7c23f4eb1ad2..64cb9b3f715c 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,5 +2,7 @@ AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e2
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
+DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
 EBUILD hdparm-9.63.ebuild 994 BLAKE2B d018ce0b5ea5343f6cfa431973e1ed2f421fd52747b0a6415360ff18a7c951e7f2b218a271bd8631a55ed333753fcf3647fdb2491d161e648a6981a6f8c2c5dc SHA512 65cde99243246548e77d69ab2a72af7ac77070dd9c5aedbbb77de05ccc79dc681072959c21872f26c3f5e70d8414e0e64b9fc3abe70c2d54fc468d38970ef771
-MISC metadata.xml 327 BLAKE2B 9cd0640be1e5123d4bfa4c7de8fd6b9bf20cfe3a238d6e271ad979efe74540708e55b9af9b134092c2db90e68550e479f8a1cf2b5a3cee5bd7e2f0bc7f719960 SHA512 2d7160e374e48c59585903e354ae7d910cdb43916fc3285d076a0e77437a864b595f1713ad05fd9146aa43a6d0b36597a76e2a096ef27129a3727e899e27caab
+EBUILD hdparm-9.64.ebuild 1004 BLAKE2B a6853297a8289a130d8adf0e99dfea2222facb232383a4281906b4047efd48f55dde7b6a97a2a1533ccbb58cd11d3a162493d7547f4f7dae50b9f335b9509057 SHA512 c4868f36229233a161f9864da477104b79036b9de36a4dbdd1eb0db6bf3ef802b1f7582b02da4fce4ed81eac4796b0b43b3d05fd978fb98b12e6b39b1d8b59a4
+MISC metadata.xml 334 BLAKE2B 4401fa870e66675b64077c7dc271c1775a3b7148a4c720ac670222d0f61ce634507725e77e5ef2b9efb6d363ca23dc2a884645ab630ffccc8e737b7139e23d47 SHA512 a71c8c705afd12b3609542d13b18697e9c4626c0c41006ccbdacd248c1c621b0fa93a522561494120c0be181d091fc27e466a25af3be25b4f3b4cc14ec5e652a
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
new file mode 100644
index 000000000000..16d39cbe5836
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+# GPL-2 only
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+	default
+
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index e98f5e38dcc7..8b7682960b2d 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">hdparm</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hdparm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index bf21d179d1fa..dadb6ccfc916 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,8 +3,10 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
+DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05
 EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2
 EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707
 EBUILD hwloc-2.7.1-r1.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
+EBUILD hwloc-2.8.0.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild b/sys-apps/hwloc/hwloc-2.8.0.ebuild
new file mode 100644
index 000000000000..88cb06eb1dfc
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.8.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+DESCRIPTION="Displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
+
+# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
+#         anyone with hardware is welcome to step up and help test to get it re-added.
+# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	udev? ( virtual/libudev:= )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? (
+		x11-drivers/nvidia-drivers[static-libs]
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+# 2.69-r5 for --runstatedir
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #393467
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+	if use video_cards_nvidia ; then
+		addpredict /dev/nvidiactl
+	fi
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+
+		# netloc is deprecated upstream, about to be removed
+		# bug #796797
+		--disable-netloc
+
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable video_cards_nvidia gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	case ${ARCH} in
+		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+		;;
+	esac
+
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 0b01d2a66bc7..10e89329743f 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,6 +1,4 @@
 AUX revert-openrc-management.patch 929 BLAKE2B 58d0fa10956bf930c176a84573a5b780fa4bcb87f6df180a179f0cbac93ede8f2147fe620007f68e563ec4a3e86228efacc2ca33dce135c5d1fa1d639cd7fc82 SHA512 ba046ae948f93d0d861fd70637c2b1acaa37ba3ef225453162eb19ae854504f518a1024c484118b86bde3f57099bb7a44d46e3765bca4b1766bf2565c990f356
-DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
 DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
-EBUILD init-system-helpers-1.49-r1.ebuild 880 BLAKE2B c09d877d803227f4fad496a7792f572815d4e1672db33039eccdc4035c3bbc27ce793cf38b2e7f9cc5e70680842bbc55d6a7afaf714400389106eccae146f1ee SHA512 d55404655ef89bc03a2fb2a10467cbe529287969ac9ff530a563899f660fdd18c18b6eb0caaff1a529d2a003212e519be5959062567a61cabb2981b5ad56e293
 EBUILD init-system-helpers-1.60.ebuild 982 BLAKE2B 3e7ac774e12f8c037a1308407d8b1e13911834906261504227193348c02d5d46f60011b1d47b20c1419c4f63da4562a20bb67b73ebd12ddb29e5cfba3ec90242 SHA512 51d60e207c837ef1dc974dd440f0e4dafc6d85f1837eef9bfcba52b4a650d3ffd1e9f22ddad47a441d9e3079b375b28abaceef51536cda94c2675590fb3d6839
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
deleted file mode 100644
index 9ab7497a653a..000000000000
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Helper scripts useful for both OpenRC and systemd"
-HOMEPAGE="https://packages.debian.org/sid/init-system-helpers"
-# git repo: https://anonscm.debian.org/git/collab-maint/init-system-helpers.git
-SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.33"
-
-PATCHES=( "${FILESDIR}/revert-openrc-management.patch" )
-
-src_install() {
-	# We only care about 'service' script/manpage:
-	exeinto /sbin/
-	doexe script/service
-
-	# FIXME: need to patch to remove *rc.d references, which we don't ship
-	# And should probably add a list of supported options (e.g., start/stop/etc.)
-	doman man8/service.8
-}
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index b0bcddada018..a0f4b90c75ec 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,5 +1,3 @@
-DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
 DIST onerng-3.7.tar.gz 133016 BLAKE2B 8bae3f51baf3526e68070856d216de9e99064e8a728942fd4b926495ae34f3021ae3c99c8b5e4ea73dacdf8fa870cba67e1d3e94f5a3f0acddef0e48c02111e4 SHA512 6150787fc8415c7aaa13d6e98c3dc72e9160308eb912d97b7c9f59c6d4f5a9612917a7ff34084ba52a80e0aac6c65dd29653dd3bd211bd261fb89273f02be830
-EBUILD onerng-3.6-r4.ebuild 819 BLAKE2B 0b179249b742d0f7a5fd2ad6c03e64ccfd7f1e9d462e198ac74c398bead9f2a15d12e2476ab3ad66d0f1722bc7d1a6da9097e09d126012759cbb2c4ce4574c2f SHA512 a41aea45ad0d06e27824d11dda561f192dfb414a9a5cbcce0b7321fbc2705a07cc3ab16056e6ef415a8c6b3fcda6a605daea0c8c5b8853b69602308f8bde1ce2
-EBUILD onerng-3.7.ebuild 820 BLAKE2B f1a5eb2418eacb46cc7c50fb1333cb33b8d91cad124c58ba7ed260e8398e80f50b780edcc07badc503ae2455955567c9998421a569104bd8366ea37b47a6a1f1 SHA512 84bda6856ead877120bb154fc009b40ca89c051fd9e5ec6a4821ad9971d34a2af93fed3134e1910524a449c0802ea4044cf422f9e56af507de686321e6437e26
+EBUILD onerng-3.7.ebuild 818 BLAKE2B e7a2111b84319906becdc7a78cc85228b86722597c6351268fce8c7a9045393aeca55859f6be8e98f47b35c86e538291fd2459678d77dc2169fa593824ec6cdb SHA512 f240cc6f2ead37e9200ed93b89e688b1a76fe2878d9070ed380e2077769a009df79ca63cb8a69ce94dce678fee6eb07db93110c07a281f09a3199de0e0228f62
 MISC metadata.xml 716 BLAKE2B a50a27c236e78467723dbc900d4b6dec63ecaa25ac3e8a3fd1ac0a0b201dd38b14f264d6c392bdc6640cc5844d58be5130bd8c26eecf1dbc28173354c6dbe3dd SHA512 f2daa15f0e04c0ed6897d10edcbac8b205ad274b1df44beaf55d4681eede00b41cbf69e21707a61b056ff938a8c3537a0696448843a160ebf0fad302712e7bdb
diff --git a/sys-apps/onerng/onerng-3.6-r4.ebuild b/sys-apps/onerng/onerng-3.6-r4.ebuild
deleted file mode 100644
index 1a720e2d385d..000000000000
--- a/sys-apps/onerng/onerng-3.6-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-single-r1 udev
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
-HOMEPAGE="https://www.onerng.info/"
-SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="virtual/udev"
-
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	app-crypt/gnupg
-	$(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
-	sys-apps/rng-tools
-	sys-process/at
-"
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/onerng/onerng-3.7.ebuild b/sys-apps/onerng/onerng-3.7.ebuild
index e8aa548f36d0..0805e3fe929c 100644
--- a/sys-apps/onerng/onerng-3.7.ebuild
+++ b/sys-apps/onerng/onerng-3.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index c39bdf5ecbb2..b8ff4d8affba 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,7 +1,5 @@
-DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
-EBUILD s6-rc-0.5.3.0-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
 EBUILD s6-rc-0.5.3.1-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
 EBUILD s6-rc-0.5.3.2.ebuild 1115 BLAKE2B 00fed9fbe5865de7315607d24ec115c7f250dbf2002eb665294acee5432014ffa36229f0bcd21bb5b5fbf3cc2add539bc1ac8877f139022a8207f499617fbc13 SHA512 ac171864566939e4314d9043de2e106b49478ce903295fbbd9a730ad5c453960f466921374a5038b89d5d44edc9fa7c66f3bc663985f2739e21805e7deb6c637
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
deleted file mode 100644
index 4c6c8d4c1bca..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir=/usr/$(get_libdir)
-		--libdir=/usr/$(get_libdir)/${PN}
-		--with-dynlib=/usr/$(get_libdir)
-		--with-lib=/usr/$(get_libdir)/execline
-		--with-lib=/usr/$(get_libdir)/s6
-		--with-lib=/usr/$(get_libdir)/skalibs
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
-	ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
-	ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f28e5856fa85..6af78465bb92 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 7c9cb4dadd50..9fc2cceade51 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -8,7 +8,7 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5
 DIST galera-25.3.35.tar.gz 1278869 BLAKE2B c5c0cc1d4ad29caf94550a6b96ab9762a97273713b906c4f3e3d9851b90b1028246285e74becc912336edbb6e1a427d9bdd9c31177f3dd899153dbed54cdde92 SHA512 aaa7038cf9e8be57ae1760d259af31bafa8d3c994c46cbb6224231fe3bb63d7bc830a97a2d4833cd24b85a47da2e4c7bfc2a99d73155d6bd6330e4a9dda3083d
 DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
 DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
-EBUILD galera-25.3.28-r2.ebuild 1791 BLAKE2B f872670f98a7c346cf1290c9b9ed9915ab12bf53db8d9d08f1bf23f26b119e5f7a924c32c06dbc408d9107c6430c5fc14bc777fc1cba3f4ecbce856802e26af2 SHA512 74d2354bba504c2485fcb509e8bb257a47d61b04c91a14447a48b0c761d605b881abc7382da1834721766a8cdeedb2af4a4a61e4e7d8e282ebd4c98668031513
+EBUILD galera-25.3.28-r2.ebuild 1790 BLAKE2B 3923422bcbb350a5e9f3dcdf81aa5cebf080aa166eecae688286cdaef61b15458ef12a1fe8b29d1841934486e4d23390910882740d554bc5b27ef0e962b1c105 SHA512 8b005ee8c3f5d55636c42b7a97ed400251d67f3eeb9ab87924a0e48dfc98caff525ffbb7906620289d834ddfde0444498f18aa1e028b05a293081f3ec736baeb
 EBUILD galera-25.3.35.ebuild 1792 BLAKE2B 649476c55cdcbc39934a9721f4f80109ece1051abcdf28a2dc1db76cbbf8bc25c73e3d1460d27d46cf250755d852a96fe5e1322287f56a110efd59d7f521f68c SHA512 00273c615261c96a724cb53ab98caac0850ea81a29095549a417f7f46548282442e1d6435327b9d571ff7df9ea49e3edd344121af33b8a3a3a95284d4c7d2461
 EBUILD galera-26.4.10-r1.ebuild 1978 BLAKE2B 0ed3ab37c592ba79385ecb741dc9219e89e70afa9b90f4d86ce00fd5146b79ab9d609f9ac8954aa29869aa3afc206a87b10974c3112bfb8c3bcdb000889499a1 SHA512 93c91cfe04cc23dac82d36a8974d2c7f10a92f635d279aa899f17d4766efeabbc46ee1d862d464421fbdb04931c0fe24442f037b9fe17abdcfe235e8a332971b
 EBUILD galera-26.4.8-r1.ebuild 1911 BLAKE2B e070c207b9bb9712cfeef9c6661ba181b547859601ad9474013bc31fd816400ffa1d7317df7ee01318ed746a2eb46505bf9ccee37f8773fe1c828101eca7f881 SHA512 7993a20a34443797f6d0f80fd7e34b6341d35550257672b618c90fc0e61dc30d5ce888447f27e0149e573a35b9ccc6f95cebdcaaecda6cce51602a8202bbd940
diff --git a/sys-cluster/galera/galera-25.3.28-r2.ebuild b/sys-cluster/galera/galera-25.3.28-r2.ebuild
index ba955276dbd0..e45e685f02ae 100644
--- a/sys-cluster/galera/galera-25.3.28-r2.ebuild
+++ b/sys-cluster/galera/galera-25.3.28-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index fbe26cedc933..85b5b21bb638 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,5 +1,8 @@
+AUX hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch 1456 BLAKE2B 83026795fc6c8c8dce453c9069041bc6bc18866514de00edecbd14d75588a9ffe3d16d58478e83b989ddbc36f69ae451b3f043fd68ef6d16b2e32d1795c63a93 SHA512 dbf142b1d3741712fb14b47f7667ff76c03ecb21fa60e6ad0e3b312228af63653c11c63156eaf079ba818e280b885fe14cac9bf5095a8c8f3a0567c4be2cfc2e
+AUX hpx-1.8.0-fix-musl-execinfo.patch 558 BLAKE2B 9fb0acf6a7045a5f2f88fa545a9e85f99171c427bc943998518c6c7d412d9efa0728b2efd6d2d99d58f64d9937ed3c0e0446a1232944186c430ec9b0e6f9218c SHA512 eacb4ff7e886fb01975fd3e47bf2cc9181609cdb81058fb4526e73314ab0be0f4761773ad31c12de88ce1a49af18862fe6afd4146ebd6f995fac91c26e5367cc
+AUX hpx-1.8.0-fix-musl-rtdl-not-declared.patch 1110 BLAKE2B ccbdc1592b5b8a6fdc44c739805bbcf9ecb6acae5af7681a1fcfd9c483af60640b737b06aacfdaa6003121ced80ade8250747dbc33fe251999cbef72ecf68f25 SHA512 2d1558237bff3d4bbc21424d0415dc9d59ad01e14c5f38f59b28ed1fbbb60898cf8cc092efc049eebf4232f3fac2dda976a223c14a2d3778978336f620b25de9
 AUX hpx-1.8.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
 DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
-EBUILD hpx-1.8.0.ebuild 2282 BLAKE2B 476428179a09f9255e5681de06834e016e7a090beb87c9d517c363ab03465e6aae2036dff9ca028a1c327c4a4a6ce71bbd0d514dcf675d0de20055177aa07e56 SHA512 2e37ed82a434a14bcd3fbe6b9a46f555cd5b2bb20654ed7558048d496884e329f4a76eb8a1164a74d3a8c769de606162d5234431d031122c7526ebeb8515e825
+EBUILD hpx-1.8.0.ebuild 2440 BLAKE2B 4b436f6ea76d03b748a92330ac8c18cff6c25730b5fd4144e8ca17235fd574a1758082d70ca73d40ff95132ce0a67b070c65d33a0c94447ee5f10057322c60a1 SHA512 34618fdc3f7cd3dc32ab98db4166c2039b179478cc7cf637db6209af90ad2a96b51000dec6ad71bc2051322252fd3777aff4e86a216abd1489c9b5dbbaf350b6
 EBUILD hpx-9999.ebuild 2236 BLAKE2B 49029b81775c6cbcf4afd8affbf814e4676288ef806ae3ab4585ce098e5251b2fa2a982f73ec678ca08b7168f3b18fdcecaffde446c38a87ab3b03b61c3628bc SHA512 a1f18c99c3c6eef1fc4740e83af7f1ddc079deb3e10c5bec26386bfaa9e4f0db522b611f79ce5281ab0ee05f43c789401b7169488d6c9cf76394734a49157563
 MISC metadata.xml 1220 BLAKE2B a5837e65f59f895e5680cdcb7e82d6ef775d36300e86bd3b180f223ef4516278a9af17f361e2e55c10b42544c134cc1b7d677d46d20d0e400169fcb4b863d22d SHA512 62ff93d5e85b160d042e55c16a1755937dc85e93ab7c25b96d4ae90da099582e1b7a741d3588e8446fe45c354f0d9b8f7589cebcf999b07a64906d71c79474a3
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
new file mode 100644
index 000000000000..d2e54b9df256
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
@@ -0,0 +1,47 @@
+# EXEC_PAGESIZE is a preprocessor macro from the Linux Kernel headers. Include
+# the appropriate Linux header file <linux/param.h>
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/components/performance_counters/memory/src/mem_counter_linux.cpp
++++ b/components/performance_counters/memory/src/mem_counter_linux.cpp
+@@ -14,6 +14,11 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ #include <hpx/modules/errors.hpp>
+ #include <hpx/modules/format.hpp>
+
+--- a/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
++++ b/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
+@@ -37,6 +37,11 @@
+ #include <stdexcept>
+ #include <sys/param.h>
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ #if defined(HPX_HAVE_STACKOVERFLOW_DETECTION)
+
+ #include <cstring>
+--- a/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
++++ b/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
+@@ -67,6 +67,11 @@
+ #define EXEC_PAGESIZE static_cast<std::size_t>(sysconf(_SC_PAGESIZE))
+ #endif
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ /**
+  * Stack allocation routines and trampolines for setcontext
+  */
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
new file mode 100644
index 000000000000..4c82ca3f6be1
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
@@ -0,0 +1,16 @@
+# Check for execinfo only on glibc and ulibc systems.
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/libs/core/debugging/src/backtrace.cpp
++++ b/libs/core/debugging/src/backtrace.cpp
+@@ -19,7 +19,9 @@
+
+ #if (defined(__linux) || defined(__APPLE__) || defined(__sun)) &&              \
+     (!defined(__ANDROID__) || !defined(ANDROID))
++#if defined(__GLIBC__)
+ #define HPX_HAVE_EXECINFO
++#endif
+ #define HPX_HAVE_DLFCN
+ #if defined(__GNUC__) && !defined(__clang__)
+ #define HPX_HAVE_UNWIND
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
new file mode 100644
index 000000000000..0264aeab52f5
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
@@ -0,0 +1,25 @@
+# RTLD_DI_ORIGIN is not defined in musl as a result hpx fails to build.
+# Closes: https://bugs.gentoo.org/829242
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
++++ b/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
+@@ -319,6 +319,7 @@ namespace hpx { namespace util { namespace plugin {
+             std::string result;
+
+ #if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__)
++#if defined(RTLD_DI_ORIGIN)
+             char directory[PATH_MAX] = {'\0'};
+             const_cast<dll&>(*this).LoadLibrary(ec);
+             if (!ec && ::dlinfo(dll_handle, RTLD_DI_ORIGIN, directory) < 0)
+@@ -333,6 +334,9 @@ namespace hpx { namespace util { namespace plugin {
+             }
+             result = directory;
+             ::dlerror();    // Clear the error state.
++#else
++            result = path(dll_name).parent_path().string();
++#endif
+ #elif defined(__APPLE__)
+             // SO staticfloat's solution
+             const_cast<dll&>(*this).LoadLibrary(ec);
diff --git a/sys-cluster/hpx/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild
index a1b86f1f953f..118e080a1120 100644
--- a/sys-cluster/hpx/hpx-1.8.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.0.ebuild
@@ -47,6 +47,9 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-python.patch"
+	"${FILESDIR}/${P}-fix-musl-exec_pagesize-not-defined.patch"
+	"${FILESDIR}/${P}-fix-musl-execinfo.patch"
+	"${FILESDIR}/${P}-fix-musl-rtdl-not-declared.patch"
 )
 
 hpx_memory_requirement() {
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index cfdb12a9f824..dbb81245e95b 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,6 +6,6 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r104.ebuild 8047 BLAKE2B 29079bbcbb24f809a9f1d0409837701c1b261d4219ad8af31b610d19483ef274415cc73f9a0caffb01e52ede78f122c8860147ff313d71bc59a65a6c9bc58abb SHA512 758b96213cb29a5dc4781609177961a332b0f3b6846ea06169797728f9ccdc88521d3c8aa77bac41838e2d8072c35bf0038d925d69341b934fc52f36a6e387ee
-EBUILD slurm-20.11.0.1-r105.ebuild 7991 BLAKE2B 0e1a49dee0f9d1a54a7b6b2b1e9ce9e4eccfb5da666cb1a461dd065e9ac539004c51827763e2499dc97ec34ae5b5697e08c6ef1b3efc26674720f6a33917e16e SHA512 2003e1ddbc4e13b11a426edf4334a202e4383c2a2992db9da412763ae515da70c36bf83d6fe98f05f475f3ec12706ab85f935b783d9492509904c529732874c7
+EBUILD slurm-20.11.0.1-r104.ebuild 8019 BLAKE2B c381365a04ecebcb814a0e021995c6cb13ed51757463f895fe84a7902af361fa5d2114111536d747a81082a13e64931ecdb6fb3ad6e6b06b9c09ed7b5b77d420 SHA512 fcc42bdf19234fb54031acec779db758ddb6b79f6176c63f43a139cb3af43a077665cd1014ee279714e1a374369eba198971ede0c5fae05eaf9edb4a37126f1c
+EBUILD slurm-20.11.0.1-r105.ebuild 7963 BLAKE2B 1c36790cabba918296a53cd86dc56623c002d631d861358e87bcace6fd5382bea1167358900ac62d1009f0e2f48ee17736927f496ef49c3d9f52973bb6c1eaec SHA512 e807d0e55d1c7a788b8c49947c97d6c7474d82998dd79198e9e4f76f40c4f23b466f70cdc90b617cf96912be313df4c2baea6e7cc8de5bdb6503574cabcdb19e
 MISC metadata.xml 1092 BLAKE2B fc708ed8e57e531f3c2b10be663f2d64d2aa6606972ee0e5030e0d2fb2916f3b67947407c5a0505bd315dc7cfb91a49ef9b5db49a7134260fdbe6570cbca8710 SHA512 74d0cc46c6b4fbf7728cdf01c021c06c944797cc8a35d32e8b155920f2b9ff9240c5c8e8e4b7ce5b1ea435c36d4da95a36a3ef2875c2ff93f4820e6b4bc1214a
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
index a4c90ef8ec66..ffd4361860d3 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
@@ -157,9 +157,9 @@ src_configure() {
 		touch "${S}/src/api/.libs/libslurm.so" || die
 		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
 		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		S="${LIBSLURM_PERL_S}" perl-module_src_configure
 		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_configure
 		cd "${S}" || die
 		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
 	fi
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
index dd2ad525430a..0445fde0fe39 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
@@ -156,9 +156,9 @@ src_configure() {
 		touch "${S}/src/api/.libs/libslurm.so" || die
 		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
 		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		S="${LIBSLURM_PERL_S}" perl-module_src_configure
 		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_configure
 		cd "${S}" || die
 		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
 	fi
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f752e1ffafe6..0f54fd389d43 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6207fb8f1514..49787d807dd9 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -25,9 +25,7 @@ EBUILD binutils-2.34-r2.ebuild 11770 BLAKE2B 7cb3c8bbeb0ae93677d13f8c036a8886e2d
 EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39cd62ffc686982598a8041b6bda0358ab39fcf4cfdd6fda3b444859db97c39a50971032008dbd982301e1afff94b41 SHA512 6c6820a8206cb8cf5d4df8e1c1e5448e0a3ba77ab067bc49525787beadad464aef27fb04debbfde4720a3a44b02a4206fd4b3c4d18eb19428a7d98254753fd05
 EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
 EBUILD binutils-2.37_p1-r2.ebuild 13024 BLAKE2B e67ed4a55a9f07ebd064c82901bc6b5e23933f562c8b6258d32649571f38cbc81061fcb886feaa70619d46d47c52cd701745c173ccf060e47c5cfef2d202a8ca SHA512 480b1921ff344b943b1cf2c1ea9960cd5252f8055a4bffc109f096b038d4d1fc2dd670d696ce7217fd1d827eef5c07cc81c7d0886fc554d939535582d5300f26
-EBUILD binutils-2.37_p1-r3.ebuild 13521 BLAKE2B a3b84f02236cb365ff292737a1953095f55112fbd83443c8ae59396309e7eaa9ceae2f50701aaa9bfc54b2c1e8f018440d46400cdff5c0806262ed9cea2ef62d SHA512 241e1f20b8f2f6eaa350c490a4fa32fc1fbf9092cc665728bc5bfa0a560deebcc9f17634e992fa5af28b64cff05156e59730c3421dd891a292a598809dc01c5e
 EBUILD binutils-2.38-r1.ebuild 13032 BLAKE2B 23dcf886c2fc5837ad09a69fb5671b65e57cedd0b1275242da32d6fa07ca198ebfc08875f0675193651f33a39b4f872cea46de2953bff94246d5f0db22e20abc SHA512 9fcd78ef633f16e1ecdd5c5ffe68f182e93ad8c2fbbcda8a80d00870b102c4801a65781251ecc623a6f7d42a20d60cb29e88d074d7b8b9a0736e63f252420603
 EBUILD binutils-2.38-r2.ebuild 13410 BLAKE2B 2aadf421e6be88cd7988bd7220b16f465f4503457161886a7a8d4bb922fe673a4e061648c1a16529e0ef9901ad962a77591d8a5ca90f0a21a4ef5ce6e38dcacf SHA512 686d9d74b708f752bdd5028fac45bef48d565b39253f7fb46721dbffed6228e100561af0ab6c2d138813983f580a582a5823481b7ddeaa0bc348e79ad875a4e6
-EBUILD binutils-2.38-r3.ebuild 13899 BLAKE2B b630055d3594adf80ff2064089645725f371dc87ae806cff4cfb21409f321414a7fdc7c019f76ccfbae477f968b3361a7f558622f3b8e6879fb52600a442afac SHA512 52da3b15acae5e0908417ef37aa52a0d0f79b61a90ee224dadcb1873940106d4ab3a5b47f41c670a8b3ca8acab3ab992b5e7b4cac0c28b6522509003dd0c5c99
-EBUILD binutils-9999.ebuild 13781 BLAKE2B b418d53a5f00969e5d94efcc6de5a3cf1c84d7aaecc2bab60fab62cd417879ad59d55abc91eecd7971a8f38db0faa3581f227487e7aca32d886f5c10a5252fb4 SHA512 8c86a423290361d6201b952c9517751a3ee7b4a0d3cfc2ee5a49926d1f3e65889c53b139f570dd65eb4c4bfb5767ec9f743f208cbc5babe7b540cc11fcb8a23e
+EBUILD binutils-9999.ebuild 13294 BLAKE2B 79f45745d587339ee51310dcc288b4f80ef7a3b84ea19903addbff9cfca2f2482e9f24120c6c13f50b599588ebcf1dd629d14fc8c32bfa22446777581792c35d SHA512 16c45b6796846fe12b583f43eb6e9ad0b5058e5b2564a2b87d135516c540f2d3fc656daaad8b6dba948efde004c94a685b0fd3300bb79503aecce31317a43b18
 MISC metadata.xml 815 BLAKE2B 0d866827f8a6d0244be472dea595d5784ea60464ba361cde9bd062473b5eb19ccecc99bb58729acadd2cfe7dc017cdb2107fc282a31be6ed96c757954e6c9ac0 SHA512 8996f29b159ba483293b8d80eb62372ee0016e817d9ac55b7de9c211aca770b5a05135e705aac108099181d879daf5e22df1facab64bc7765966b3d7e3274e16
diff --git a/sys-devel/binutils/binutils-2.37_p1-r3.ebuild b/sys-devel/binutils/binutils-2.37_p1-r3.ebuild
deleted file mode 100644
index b6100c1d6a22..000000000000
--- a/sys-devel/binutils/binutils-2.37_p1-r3.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=2
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	#KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-
-	# see Note [tooldir hack for ldscripts]
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-		BINPATH=${TOOLPATH}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-		# Works better than vapier's patch... #808787
-		--enable-new-dtags
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	if is_cross ; then
-		emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-	else
-		emake V=1 all
-	fi
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-#
-# Now, this would all be very nice except for the fact that the changed
-# directory makes libtool re-link libraries during the install phase.
-# It uses libraries from the system installation to do that (bad)
-# and fails if it cant handle these (e.g. newer LTO version than in
-# current gcc, see bugs 834720 and 838925).
-#
-# So, we apply this whole hack only for cross builds.
diff --git a/sys-devel/binutils/binutils-2.38-r3.ebuild b/sys-devel/binutils/binutils-2.38-r3.ebuild
deleted file mode 100644
index 3fd587616c36..000000000000
--- a/sys-devel/binutils/binutils-2.38-r3.ebuild
+++ /dev/null
@@ -1,484 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=4
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-
-	# see Note [tooldir hack for ldscripts]
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-		BINPATH=${TOOLPATH}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		# (--disable-silent-rules should get passed automatically w/ econf which we use
-		# in >= 2.39, so can drop it then.)
-		--disable-silent-rules
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-		# Works better than vapier's patch... #808787
-		--enable-new-dtags
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	if is_cross ; then
-		emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-	else
-		emake V=1 all
-	fi
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake V=1 info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k V=1 check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-#
-# Now, this would all be very nice except for the fact that the changed
-# directory makes libtool re-link libraries during the install phase.
-# It uses libraries from the system installation to do that (bad)
-# and fails if it cant handle these (e.g. newer LTO version than in
-# current gcc, see bugs 834720 and 838925).
-#
-# So, we apply this whole hack only for cross builds.
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index ae887224952e..ec3589ae100a 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -157,14 +157,12 @@ src_configure() {
 	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
 	INCPATH=${LIBPATH}/include
 	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-
-	# see Note [tooldir hack for ldscripts]
 	if is_cross ; then
 		TOOLPATH=/usr/${CHOST}/${CTARGET}
-		BINPATH=${TOOLPATH}/binutils-bin/${PV}
 	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+		TOOLPATH=/usr/${CTARGET}
 	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
 
 	# Make sure we filter $LINGUAS so that only ones that
 	# actually work make it through, bug #42033
@@ -310,11 +308,7 @@ src_compile() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	if is_cross ; then
-		emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-	else
-		emake V=1 all
-	fi
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
@@ -342,7 +336,6 @@ src_install() {
 
 	# see Note [tooldir hack for ldscripts]
 	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-
 	rm -rf "${ED}"/${LIBPATH}/bin || die
 	use static-libs || find "${ED}" -name '*.la' -delete
 
@@ -486,11 +479,3 @@ pkg_postrm() {
 #   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
 # - at install-time set scriptdir to point to slotted location:
 #   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-#
-# Now, this would all be very nice except for the fact that the changed
-# directory makes libtool re-link libraries during the install phase.
-# It uses libraries from the system installation to do that (bad)
-# and fails if it cant handle these (e.g. newer LTO version than in
-# current gcc, see bugs 834720 and 838925).
-#
-# So, we apply this whole hack only for cross builds.
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index df5c3c6b70b3..8ed84dd635a8 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -2,9 +2,11 @@ DIST crossdev-20211121.tar.xz 28700 BLAKE2B bfe637dcd3c5b6d45e289d6298de18cab4b7
 DIST crossdev-20220205.tar.xz 29088 BLAKE2B 46e90557f0a6df49e4f6ab7be6495514a188c4366868290d3b6b879ad1e5741e1600bca237735290f7e9278d441534569853b582cd85b96581c6ae0517cb4c54 SHA512 72e7cf690d49a87b32f6fdad2462fd4156e4e35a3f0b5f30911012a2b7936bb999575f757547a7a805c0cfdd1fd0caa8b23bf61e72c4333096314043ed565f40
 DIST crossdev-20220424.tar.xz 29316 BLAKE2B 8b026c165b643262ef934fb2daec5484bc2a2e8c2cafbaca08ecb81c2870a6306dd834c9f72bca8cbe219d1b24274fef0b83a88e301e66d98a1eb0825bb2e161 SHA512 3c2ac2d9c79140c6e0aa7ac9fa7838499f003c6c9c1260abf4b0b7883d2179ef1ded5ab0ba14ca48d471edde5090e22a50fffbf25fd86a32d354a9541e4fd567
 DIST crossdev-20220617.tar.xz 29396 BLAKE2B e3b39edfb4cbd5808851b56d86646bc879ea875b5e320802d86073236474e3aa80c5dbefc42ef4799528334bfb5a2a0abb5c0b344ebdce39ec01aac59306eb84 SHA512 bdc5ea519e4cd6275e8171ff7cd35c8ae45b6240fefd278997e247c8b0758bff6563f7e2613072e179ec4735155f05236f32385fe13579c5e955f761e0859e43
+DIST crossdev-20220709.tar.xz 29408 BLAKE2B dc96be5d86b343215564c2c15e91314c5ed88c765cec4f222b08a7e942ab5fb230915a0cdc3245719c0b12b4ce579066c6a88ae8e7ef4e44b80d8f0c5ddf7663 SHA512 f27929db8b4f7036408a0db18d46eb84312e1cef279336e13a07422ed3a154f3a21821d2d5ada66c0fca37bd70750413dab87b795c957a0a81cb9f27ebce2b90
 EBUILD crossdev-20211121.ebuild 908 BLAKE2B b3e424f234669d19959b0ee39521a41f51751911576fd52b1d7b1f6792281b5880485c90750f0e644ed68a5f65857e159ae32d2fd9d621ed5234bcb0b0d05d8d SHA512 e9bdac44211ceaac37a25c05d7c86c5e522a2edfa01cad82e124d6e517190ca604921793dcd044589787b1b5930046eb9205c2804b1192d5ba3bb9ec05a686fd
 EBUILD crossdev-20220205.ebuild 908 BLAKE2B b3e424f234669d19959b0ee39521a41f51751911576fd52b1d7b1f6792281b5880485c90750f0e644ed68a5f65857e159ae32d2fd9d621ed5234bcb0b0d05d8d SHA512 e9bdac44211ceaac37a25c05d7c86c5e522a2edfa01cad82e124d6e517190ca604921793dcd044589787b1b5930046eb9205c2804b1192d5ba3bb9ec05a686fd
 EBUILD crossdev-20220424.ebuild 886 BLAKE2B 8973f7119ce9b2956c94c927576be7842bd9cd36e6b51ffe0f9ffaaceecf2d49de7b5a6046eb086418d53695231980a56bba70c7287ebd4451fdccef7df1d767 SHA512 dd4b9ad24293ac9394139136eb770bf08cb1722516e4d2d2ec64ecb64de03388e5ba4474b6559f714229ae69f78be09f3dd4b32be183ced67efb79aaf9dda2e7
 EBUILD crossdev-20220617.ebuild 884 BLAKE2B 54c6e56ae78dee84aff709bf6385a1de95f04cb07a0e759799e01f66d3e441f979f9eee4b401729c1c3dc4e7f88b1461bc13c1b9399aa7d52c7987ea0f041f6e SHA512 ea52d663015105867e1594404debe2cccb2e68cbcbe8613d59c1d2f4fa3798c22095053a9bf85132a219e5756a4b165689b36e57c6f931e772b4d3cf84baf8c4
+EBUILD crossdev-20220709.ebuild 884 BLAKE2B 54c6e56ae78dee84aff709bf6385a1de95f04cb07a0e759799e01f66d3e441f979f9eee4b401729c1c3dc4e7f88b1461bc13c1b9399aa7d52c7987ea0f041f6e SHA512 ea52d663015105867e1594404debe2cccb2e68cbcbe8613d59c1d2f4fa3798c22095053a9bf85132a219e5756a4b165689b36e57c6f931e772b4d3cf84baf8c4
 EBUILD crossdev-99999999.ebuild 884 BLAKE2B 54c6e56ae78dee84aff709bf6385a1de95f04cb07a0e759799e01f66d3e441f979f9eee4b401729c1c3dc4e7f88b1461bc13c1b9399aa7d52c7987ea0f041f6e SHA512 ea52d663015105867e1594404debe2cccb2e68cbcbe8613d59c1d2f4fa3798c22095053a9bf85132a219e5756a4b165689b36e57c6f931e772b4d3cf84baf8c4
 MISC metadata.xml 491 BLAKE2B 92c9cbc3f52be1f863dfcadca6504f1bf0a22dd6a0fe958d0407be1a00acbcf4ea591e4bb84b9d654df87039b2ead8fd3557839078f70c001f1c101ae78e71c4 SHA512 bb7c32d398a5486565c5c317509881bcfbf9da17ce3fecb562c34c8a4e432dc96ff4f53f0784ee37eda4a868ad9d764d864cffc1f052ff449cf39ed9d5419d59
diff --git a/sys-devel/crossdev/crossdev-20220709.ebuild b/sys-devel/crossdev/crossdev-20220709.ebuild
new file mode 100644
index 000000000000..1701b22179d5
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20220709.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+"
+BDEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ ${PV} == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9cf22e1d02c2..8e7473face33 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,6 +4,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
 DIST gcc-10-20220623.tar.xz 71747668 BLAKE2B 3849182a188f4a3b5f19e66008a23ab50ff5bf933d28254432d62ce880b7921124302658553c7bc1e8756c430d11b5d577685d1d70b9851b714d1e15b1d7b4ac SHA512 294093cdd0949238e903f91c4ed28b2fd063d25aa6aa7947acdb318350c582e43d15b98a78756da692d0625c6d190c67b62f215ac865594712d6f8efe298831b
 DIST gcc-10-20220630.tar.xz 71753264 BLAKE2B 19179c6ff805dd280835176955995e6a402705d69120023e3b472b4290b29babc9184a07e35c0e780aed6f4b6505c9b8e9c0fd020d251755f73c8f802c65947d SHA512 8c5f9c3a8c8f9b0d3b8236b41fb6cc1facc01bd3c1b3882a68f61ed7e9bb84ac2a478f52ac17e4a7af488970aa5935faa0635158b51edffeb2784d1dbf0407cf
+DIST gcc-10-20220707.tar.xz 71750512 BLAKE2B 147e4771b7909aabcf9de0d87fa411f3fb60fcded024f45208867a87d686b98a6a3644a2af180552369b0a7cbb559c4eb6bd64ee3a06c0c253eef5554b77df4b SHA512 33fcb7348d3b3f02c3fdeb79764eefa505cfbccac308bf8566123f075a75f0d5b2d20f8d861c5a6959464be90b167b10b9e609c3f0d5e0d4b95604f1c2e5dbe8
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -15,6 +16,7 @@ DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
 DIST gcc-11-20220624.tar.xz 75765436 BLAKE2B 642bbda212f31344822ec90bce1422146515b153ddb306c5fd1bcf25be25fea7ed5bc1aa6f5987755969e73af5de1484fb79a805e87428bcfa0b13257b9c35df SHA512 736a71de166851816914561bfbe7c00110b32f8b7e1666176babdfcfbdef4410ba07c8e2d912da2830fa14c6732f9ca555cae127481b07a85f7e689d87f9d509
 DIST gcc-11-20220701.tar.xz 75776176 BLAKE2B 958ba928ba6094e947990ef834f397d94a1f2bb0319aca77cab2d53c1eb12fce8b03d8e1b1fecc0be39f5154fb10126faf5667d6c345e65fb932a3680b55f8dd SHA512 ca378e8cb427c098099192aaa9441a2e85acc38f9a7309d56ef252e7434f7869df8f2af932f0ddc2d3c9e44341092ef05f284fed6a21b56c7c93faff68949709
+DIST gcc-11-20220708.tar.xz 75778420 BLAKE2B 77929d46f542258ca8288acf4cfedf44051303ffe952838da4ee29fb1611dc3bc474c5cc9900ff43d7ae512cdb1348aea7b45b175c9b392c90d96c07b21bd026 SHA512 7ad7d72e40114fd625878ed9b3b0e76a8ec97946cb8d0ede9353d8278e311fc3c873671a54479fe4c5ff4524b86752d7e5e92e485a07e6b59c6e9b07832a8e7c
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -28,6 +30,7 @@ DIST gcc-11.4.0-patches-1.tar.xz 13956 BLAKE2B ff6ee1b81ad214e74a49c00b15767086c
 DIST gcc-12-20220528.tar.xz 79096228 BLAKE2B 9c06ce85c6302bd43e06d35d5d5cc9e81268d368484bd60af707e6dbbe791d85ec2a177fe7deae1379d313269fcaea2ff5245e20e54ca667f452c27efb738c13 SHA512 498be61fcae7e4ec55e1f270e1d02fadfe9069692afab6442dac0b7ab480ad7112121f4728a9f99c7868e7373b2c770ad4833a3b4a1a8a43b3417e79f286c28c
 DIST gcc-12-20220625.tar.xz 79092788 BLAKE2B 491da523abc0a63bbceaa6c76b251a5b6c224e1684b5db4e6155fdcab4b0d8d505376d30a13e1b0331f37558aac311477bbb3179b63da850acae436b642c9ee1 SHA512 0527c6d69cd53e8aba3464746b7989e3128af74818864a2e5b4be66313203d32a84201440a254da8de72842b0ebbbccf1ec14c6a121cb09f9454358b0a37b8f9
 DIST gcc-12-20220702.tar.xz 79091468 BLAKE2B a15363dbab5f331b2e5ee6362ef6701307513bca211cacdee2bf17cf50cf88a019110c2b2412939b614c3346b5ec3823ee5b1bca19db526693149a163e5b98fe SHA512 e5ab44e79f641ace6d9d77ffb176f3309d35e8f36b6bdd42f09e29fcc82766933e0fb8f86be84bf7419fe9918c554544d34c448b706ec0cb052e738e5594683c
+DIST gcc-12-20220709.tar.xz 79104468 BLAKE2B 23606ba389d1e7bdcb737eae79f743f80249ad2d50c18648fbc292f00c9709263e2d865aad5fced5ca36de7843d96592eddd1f717e6c3d4c4db5d6aae8acbe49 SHA512 5601266ab1ef2afe1322d4a3c0a402ad04247510c11f3eb59102825ca4e37f41a6d187eae3b5731315ade3b49753f47fbaff84d22c39c16d3b02b9739618536a
 DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70d96e7e20f6720664cd94573b1c6cd079a0e29f73277c27b2f2570706da5239006dabd44f834824c515f6615ed5dc39c273f SHA512 cf917f40133d2b8090e98880e6c87d38129f44bcb454f4d707ef57967635a6fb571d7b85b7cb854421bc9aa88e48767a47aad99c767f9415899f97922d61c497
 DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B cdebb6fa59e594f95cc4b028d329c0fed3ffa1731a4ca1a2954b7760f4a674e773cfe5888fb2c63a619d5d80ec464d98a94870bfe2e3ea34370afce7f67526bb SHA512 a9c27b0188fd842e88d6a831cdf1f9c6d0cada4ec260b5f7e67f3d8fe0f439fb0d2c82469de9fecebd657043babf3e63a24ee53776be2617bb90e1d3dd3f521e
 DIST gcc-12.1.0-musl-patches-4.tar.xz 4448 BLAKE2B ddad7bccea7474a0552e069df25e66b4af68470da655aaf7669c2ceca7d0588cebb171e8a949c8935eeadff23af4d3de41d44245c06d48044cfc1d1fadc6540a SHA512 bb3b9e4a81efd2d0ceb405220a9c15453d780d8bc01ed5ebf4837a318e0f8ad8cc36d6ad3f2eed5051bb6dc82f223d8b61321b8f602890a770eefd69c0c144b9
@@ -47,17 +50,20 @@ EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d4
 EBUILD gcc-10.3.1_p20220623.ebuild 1456 BLAKE2B 1df37bdd7187d54fbdf615aac27ff9c72ede314cb90aa7ceb0b468f270e05e86a40dce77c9b762734df50658e9e5948344fcd3491b314987ca6117922c660e27 SHA512 f761cd77c9129bb0ed0acefdaa091ff40d025178e3e79027acc457ee2355aa9cba94c610d298cf24faee2c2c79a081615e92aa03011100e0c8cb8216e8460676
 EBUILD gcc-10.4.0.ebuild 1453 BLAKE2B ea3baac2dc8a51dfb959ad222a708268b860149fe932ef9774f828a678cf329d0c32f8059957645d453f32569ea099488df631bbcf063b298f7f40966129f049 SHA512 7f05c517cee21a55187d8f19a4ab5886201a2999d830011a97e7443bed4619e96c12bf877bc6bc30b783e2eefb0e94706c387030d676a61ecc2d5e49fc0c5471
 EBUILD gcc-10.4.1_p20220630.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
+EBUILD gcc-10.4.1_p20220707.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
 EBUILD gcc-11.3.0.ebuild 688 BLAKE2B 0ccbaaf3da7e4055de8e53ea5827bf787e85d8eec34a99235c4bf8014aea731932d20fc7d9d1b08b8520da0b0056e3c2dcbaebc5829b01b082d58ac03c51b7b5 SHA512 1de6d9ffb858daa7472813cac4fa8451d4cd4c8f8bca40878cbe25473cc3277bbc0cc708dcb8089bf3e621cd923b069b5397dccb46474cd6a68d13ed510834f5
 EBUILD gcc-11.3.1_p20220624.ebuild 1304 BLAKE2B 30a6a634b9752f514e1c1529e43d7b6cb842f44cb0a99cb9ae95a543ad9d0a783208f2639c19d577e7806b5dea120327f24893ea91f0de04160fc50184d97423 SHA512 bb90a6e3c2cb8fa31bdb2fcff26c0defe4d4d784ccea2c24169413b70540c4916d802eb21617339dd9d814cf946b8f32b379b4212a5cb2a653bff4e62e337077
 EBUILD gcc-11.3.1_p20220701.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
+EBUILD gcc-11.3.1_p20220708.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d462d249758f4de5ce62f43c7664cdfe304e48e2009442ff5e8f687ae729947d5e16f8b8dc78d459b74b1b4 SHA512 fa31a6780c63b1ca4f63fb547059528da4f0180c4be307281e54ea06bc0fd8d23599000c166fbdbfc5f618d0ffaf007ac37152efb857f5cb0d2b794a2dd4e9c1
 EBUILD gcc-12.1.1_p20220528-r1.ebuild 819 BLAKE2B c1398689a1f30a4ee55875e289ea81fc63c8a0e5624b29104a370b57e54d7edad1c6c40126f252e74a4c0ff4f1f9ae62ddd79ba900ce5d8e8762c870f8194943 SHA512 56b8adbc634f2138b7fec66379b7e6f6d886ddf53f1dc7ab2dad4c30bf7606cca4c3000173d10ec705cef8a899fc5414cabc0cdedf6b64295bffb494bb707f4b
 EBUILD gcc-12.1.1_p20220625.ebuild 799 BLAKE2B 82f30877d60dd0c8b9313c46e1b790748e920ea1e05ce6b9e76d33b6d9539f09ed37687265aa752fc496e61890ce5acba7765b16c793708a7564bea6df144d23 SHA512 818bea94f67785be1f2a390afcaf1550167c508cc4546047c4823189ce1b58111314c78cb13c91cdcd18463cfaec2aa882d738bd32367e43840d3c1bffdcbd8f
 EBUILD gcc-12.1.1_p20220702.ebuild 819 BLAKE2B 8f40ffd8a2c9215c7de90cf40c5b4b0a2afcd66b7648699ab440bcbcdf20013395d4d03ce12c00021309aaba0978d3bdf7b42efe4f5189e4e6169dc84a044a46 SHA512 c3b4ca416d0d65ff8eafbe95b8ba2e894312003be0da5660af1904960504027ad76c8f1c6af4d212cb30116d2f1ca3c261f361f96770eacaee2d4ebfc173fe64
+EBUILD gcc-12.1.1_p20220709.ebuild 819 BLAKE2B 8f40ffd8a2c9215c7de90cf40c5b4b0a2afcd66b7648699ab440bcbcdf20013395d4d03ce12c00021309aaba0978d3bdf7b42efe4f5189e4e6169dc84a044a46 SHA512 c3b4ca416d0d65ff8eafbe95b8ba2e894312003be0da5660af1904960504027ad76c8f1c6af4d212cb30116d2f1ca3c261f361f96770eacaee2d4ebfc173fe64
 EBUILD gcc-12.2.9999.ebuild 1246 BLAKE2B a88a884f288177dc3e3264000a67bf29efd2913e1b92cc845604695035e2a6524802320549b281d62f7aa47d1e18f5a9a6b9af24551ddcc6d2489c8a03674074 SHA512 65110d465341c4d1ef7ca020b51ec90a17430b73c435a7310863a3c9ba1e6a01ea2902273d02eb6d008c334dfa954f92f2474293850a2615498f4d8023d4b52b
 EBUILD gcc-13.0.0_pre20220619.ebuild 1282 BLAKE2B 7f715b88b5cc957b71daf625d6cbdc23fe50ee9ea28e149f2aae381d09f35aa732458eb118b632f7ebf1903d0c8784f8aa339a9ed525a40a4fa06a879d32cfe8 SHA512 ee4d2134d47b67e40db2a3a4daa78d5fa8d8e9fa4eb3f04555e726b0a8174935bb14d7f147bf9bd81d2ffe9a1ac7ad1b693d4c5dc6d08855fb08897d22c525e2
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild
new file mode 100644
index 000000000000..b2fac30d2ffc
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.4.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="10.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild
new file mode 100644
index 000000000000..fec8a9f96524
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="1"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild
new file mode 100644
index 000000000000..4ce888a6319a
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="12.1.0"
+MUSL_VER="6"
+MUSL_GCC_VER="12.1.0"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~loong"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 8830e008118f..6b6fe70ecde3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 6626e902bfe8..ab81b0ae9dda 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -172,21 +172,21 @@ EBUILD gentoo-sources-4.14.280.ebuild 734 BLAKE2B 333a6cc64d73589ac11c139a764839
 EBUILD gentoo-sources-4.14.283.ebuild 742 BLAKE2B 7d8d0462f487719543839d8928ca91181d31d9bf5162aa8ca6ef972b955a287cf0a8d93275203db42162a8f61b5b920c4c127315235b6e7175fe47d41cfbde76 SHA512 41b474f818a37643aa73b504dfa7a08a144d837296aab7e818c06cbc9f90829f78a24b0f23f573a5f13246001366fc0e58b6dfad2e3fe76465a8adc3ca22a40a
 EBUILD gentoo-sources-4.14.284.ebuild 742 BLAKE2B fded4aeccaca719f94802f28cf321d522d0a50068ae5115e32272a42c9efd1264717c0912b06839003cc21f50774fbe05fb3c03c2ff9e1952230ca144771664a SHA512 fb75f19d4b1b7f4307b4eea57f12ccaac398329a03cfadcd376b8b7936dccefa868783b9a3556ab80c59e4e4ad7bd741d49b57efe2a8c5f4ae986488afd70501
 EBUILD gentoo-sources-4.14.285.ebuild 742 BLAKE2B 7885bf89a76ace308cd833579bf29c01de5be629983caf6a80af63c276dfcf56eda6228719c3475e0d3d3b7c11361389829982e225fe285adfa518df839484a5 SHA512 9f6462451d42ed5860cc79e023b7d7c132f4fdb28060270a4204877b200c33478f383b50d61be45a48622e826dcbd91dd06e2d38fbd4b98cea7e605a04cf00e6
-EBUILD gentoo-sources-4.14.286.ebuild 742 BLAKE2B 0e13046ee32c96bb6a7e959c44af6a85a9c3c38c56d1b955d72087b59fc562c2ea6192ba47b487c3fc084986ff66e34b9d218f8847a93920468c069fa8bedc95 SHA512 0e5e6740fa53923c99abbc9665944455e9f75d6ab3806331ed77c22680a3b33623db3dd70bed70306e581ffe5046a839c33781990888d2bd60c9b694542dfda6
+EBUILD gentoo-sources-4.14.286.ebuild 735 BLAKE2B cc64bf6482fbec5786fee22379a605b0d75bcfbee4c9ced2e4040faab796ebb5f76989ffa2d203cdd33c21fd8cd15e7232565f27a8108759c75fc5fa4ef576be SHA512 dd4218528cb7e352d94182efc41b37f5fd6dbe5c3fcef41757a2ba8fe259c63022148820bb43f10a6d5529429ed29b30175428d11557decc6dd8abfbd3378348
 EBUILD gentoo-sources-4.14.287.ebuild 742 BLAKE2B 92081202a50bc61d79cb6364943cbd445f053c4b087e844b587d08c7435be942b47ac917dc74f95c34c16df0fc9a68f1cab783c498306ec019712f91ed17c6d0 SHA512 e4faf1ec75329cb058b665bab5ba970a58fbb289d62fcee9f5ec1b931ad0e177e40c582ab60580a37c29ac835c07de24ad88c105ce245d65e57cba4d52ad96eb
 EBUILD gentoo-sources-4.19.244.ebuild 734 BLAKE2B 705c271d2f72b0ccb76a8989463685d16bfaa02c9448a41e33f34b29acb2221160a7c95ec704f19065c14f962788998b19242c9221cf573044b579e503eec9ff SHA512 f126d2b35e91c60a82696b18beb10019103e70c2e019e803a3d67ed6efaf77b3fe7815b1e06a5aec6fffe911499847aece8580e4b0d9d3a59467b93e7ed06d1e
 EBUILD gentoo-sources-4.19.246.ebuild 742 BLAKE2B 5c70dbad7a55c182e6ecdc1f51e4dbe5909a0fd5948283311c0465e76abef8baeb3954153787aab9bf0dd8f8f25ad06f8e061c86386bba21a22ee78da736cd9b SHA512 c349a0028ad7c053df41a8f9f65500f2ca7a2b2676680acc883bd94d44c67e99e035cf95377ad87d37c1aed08d0202e22a325196da1308a9b764a619b3e82d0b
 EBUILD gentoo-sources-4.19.247.ebuild 742 BLAKE2B 14cd1072c320fc48ac2f93339765632d2f6e30c4cc93ccd3101e2e34679893a07042c9e58d922d6047ce9d1815a0d883a3bf9cbd7623036e053680bea2fca1e3 SHA512 450584410edba59100581fb43e992e68d1b88f946bbd16619b65dd7f3a308004154485747028e92dbe123b958f1951e30ef3773a019e656a87ef461da8c2c580
 EBUILD gentoo-sources-4.19.248.ebuild 742 BLAKE2B 0fe228b6b10f23ae856d1bbefe722d1440ca2f094c9e257bdfd84b6488aadb40367cda3b487225d6c885774b8d2c9fab2e6a4d45bb9afbaa85eb024e1eed0f80 SHA512 8cc25c397e15fdedd1bdbaa2e65cf1019848e90022539a20275c71e047656ab8d78bba733b269f0960547ad7c0d36d7dcc15163f6545ec0538a90221127cc901
 EBUILD gentoo-sources-4.19.249.ebuild 742 BLAKE2B 0ac599e8e9a2b7a3529e24801d8a727c82c9f0e8bffc2d3ec64f5fcad66e9f69b4c0b1d2a42bc93a974186f6df57aa7bfe10ce5406612063a3fdba7ef54d1639 SHA512 15676e738c0af2012a41cfe9ac8e719099598960a8e8230f4de2d15b2867ff33e618ce89962c2da541b4939ea755e637e75e576547de38eee6840e43226f7bd3
-EBUILD gentoo-sources-4.19.250.ebuild 742 BLAKE2B 649b6136f02d01a775f3ff33b770790d903e59ffadd700edf425f4dc579fb51a9baeb31b13ccd0dac569326c9921193c01108d92492020a24764a9af97c9297b SHA512 64a03843631c16f680ad90ca1ab9aff088bf7805843da97cc434c46636437297f8c2b9309348ae5c93a1cae16ea80fa8b8cc783a68a4ea9f6a8aedbb929c1543
+EBUILD gentoo-sources-4.19.250.ebuild 735 BLAKE2B 304e8f45e1eb1b6965bbdb6f4ca2b86cc3960f05254987c1a566012c9b3b11fe0139e55d5452e478c0df81a7c34bd9ef060d7970d62cc14cbb7a76d04a31db87 SHA512 3b409113cbfa4990c2e5d3a923888bf0d4e6306e169cd407446e35da6eaa7a9ac89f93c471f963c3e28bb0b264c676fa7db8c504d66b6afa231c95b673ead521
 EBUILD gentoo-sources-4.19.251.ebuild 742 BLAKE2B 9d3303e7a4be23a9bc760f7121ffd671a41affb8a4dbbe02ef8492cc413376d9e01d229ba613358b35697fbc418b05b5a3680dcacb8e9d583be650a69047633b SHA512 2073d2c9b86e372e28dc2760a4fdedb28406f64eb07eedcfd7c365fe86beda6b456a12237ab0a6ea3f2d17a610beb20e46928ef659625d8b5951b369deeb5bcd
 EBUILD gentoo-sources-4.9.315.ebuild 734 BLAKE2B 5c84d1adb0c04d2269039bb84a9f8b351cfb914d70c1249d1f00c09ce430e84c7bc8a404043b0fecce8d869f1fc32d82d2a56968bef4e88ceabf28a668100adb SHA512 083e79e987016712dde1c72433fd3b3fb0ae7355eac66abce77d5b5df86f244347f587f7b860cb3aae675d8914c850b9dd22fe3a6cc614c9561b817379649b93
 EBUILD gentoo-sources-4.9.317.ebuild 742 BLAKE2B c5e7b85918e7af71f74c9480054e5dffd8828e59e2cf68cc4e93bde111b99047280311a5823361581fd3ed2b6ce906a6ace42c27d1f691829648ba854004056c SHA512 a99535afcb8e983774f7eeca56e854919cacb5ce66f2d4eec130b6d598c460eeef1757f6f955a65ef27290165229b71e235d9dc9ca72b6afd5ecd6c41342005b
 EBUILD gentoo-sources-4.9.318.ebuild 742 BLAKE2B 6bdd02c94bee05a6db0012a7218e7dadbad92934105238726963fbe58b1ebe4d99fb812f944d6121f5393274f611ff0edf5d6a9baa37cb6805144bb23fca48e9 SHA512 e2f3431092036f27d8f02e429cfb278bc793fa54e79dbf22fbc96d3a76690191ee430805213849cd97cd61d3800952c5b2dc3f247f5400e4abc6cb6702463fd2
 EBUILD gentoo-sources-4.9.319.ebuild 742 BLAKE2B 9ce62a9a4e5d55ff60572bd7e82997e4de05cb02d941799361c9e742f331ad55b4ea33c0cac5dd4ef4af34d67f474d250c4349edcb41928f9859c50454945392 SHA512 b702f4fc142dc826b357cb1c289375af60b5faf9a8f5a8a8ac9b6efe07d86046ffaad79bd8d1104f5e99cb262cd8dd51b15ccb7c59286fc4e6796efc71bc5036
 EBUILD gentoo-sources-4.9.320.ebuild 742 BLAKE2B a5791186662053c679053148901a3c2717bdb8752771dec239da27e40feb6e20041d556277a302689e0cd290c6a3e62eb2f27a06a2ffa5150b7fa2f8b14ef0c6 SHA512 88cfb3966ed9b2594f23da503145a16b3edda08f7e407092ad4f75f3d9be9c598dbd5e6645e17f8a4797d0918fa5077d73202dba0737be900b3ebb5f10126145
-EBUILD gentoo-sources-4.9.321.ebuild 742 BLAKE2B 73f40e8c40e69e432fe4bbbc169a794893fa1367d83892c58b629aaa211a56729349cf3c958d9183c08470dd2b7326591df468388c36f6c8ba9e27aaab9d49f5 SHA512 af9ad6f381c5076f0b86ccf9bb90a5082d929798031fcbec2456f1b6402e91d038549df0cf07194a3b072a9a650f98fcc9749409e210dd6e370460ec27325c05
+EBUILD gentoo-sources-4.9.321.ebuild 735 BLAKE2B 2a2690fb4e89b183b053feec0d4434af2a41e47d28d732fb9e61688b29003b304a01b2035f65b5dea594ad5fe3704045e9e1f6fdff4027dd54e3b1cd82734aa1 SHA512 7aa0f5dec60b9e6e26563a66c15e1ba213a9539da0c4d3e48b99e9e03f28c431940895c98e6882b40d2dbc535b6b0dabdf28a5258b4186a3dc88f920e336c569
 EBUILD gentoo-sources-4.9.322.ebuild 742 BLAKE2B 886e7c34a3d3d9b67f8e60e379f88869285057072bd8e0af85cd8e240126e7e3e24c015a20a4c173c2b981929d169f6251d1a719dd05e58d354c878c8ab13140 SHA512 40b514b5bab0e3d155ec5b65a74e5bff4c360711bfc5877f2e149eaae732a2e659bdcdbcf534d111372db259034fcdc2b44f87c7971bbd316bd2f488f6e9888a
 EBUILD gentoo-sources-5.10.117.ebuild 741 BLAKE2B 42c0a36c384315cbe7d2eb4971d25617486f3941bd1ffbbb4dc93733cef0b140d3396ad38b91afb84fb5ca10e1c06b90af3561e41c8ea2e1cc7c2343db5a96da SHA512 814020c6ee86fca7573a5c39d665aa251b72f4ac6c00dc30272265cc95ec444ea355c5c5908693b5976106cc77fe7092d2cedbadaeab9321bfbe660e1eeb7f71
 EBUILD gentoo-sources-5.10.122.ebuild 749 BLAKE2B dffdff30d55e246a2d834a865d12a4e84644fac110041a9503e54b0cff2d98a21be9490c3bc3c3da07921afa612fb19b6610338a6ef9ba32559e6974af68385b SHA512 0d15bd174d671900c51b2bc7c53be01f7e2b9eafd080142678a40d920685595fbd1437764eddb4a1272c04e180800a9152bc9bef614a80d6850dc47646af4f95
@@ -194,7 +194,7 @@ EBUILD gentoo-sources-5.10.123.ebuild 749 BLAKE2B 5e427ef88947b364fed2aa366bea12
 EBUILD gentoo-sources-5.10.124.ebuild 749 BLAKE2B 72a8be6531c5cc27ea3d8b3eed22e1fe739c78549e003caddeefd318f2097b02ef43d7d7365848523ec19d952248fd2c1321620d4ae3f8531a375963474adcf1 SHA512 c7f4eae8282dcb56d27894599a0781d817ddb8b84634800aeffc9d45aed4b1443d87bea70466a66568f6fa9b50d1688a83df3debe9e01a64217d5628fc2cec24
 EBUILD gentoo-sources-5.10.125.ebuild 749 BLAKE2B 90b4980d6b1b96940a10513ec7290926a42fd14ccd2ea7a286c774d67a5dece6b0f1e732736b4961899efb2bd4d37a73409bd0dbbd0788a338cf9473574aa5c7 SHA512 d8c1554a5d20cc42c2216303c1fcdd68ed758eec309d6ee3e321851daca95658a1e9c396fe6bca931055c100cbd1115aecc487f0fc1fa5385c804cc7e4319508
 EBUILD gentoo-sources-5.10.127.ebuild 749 BLAKE2B 5ed5605a616fb7158303af0b7b0ee306ebbf0140ef3a2a02fb109bd2dbc88842bb0c006ab7d70551535b85d07c4d625d603c3413f5c7ac653c791cc6c3c889ff SHA512 4df7f22eac034a9aff6b7f1b44b5e1f24392672cfb80e7d8951e19e695a643e9531e4ae9e9fc4804a58cf47f3ef2a04dfb900fbfbbff463b40a8c5647a3cf8d7
-EBUILD gentoo-sources-5.10.128.ebuild 749 BLAKE2B c0246b5f6f8f3595a3cdefd0abbbe4449d092e49d8e7ed01a818be83dd55d3a652a35dfd8ac0692d6c8d668d5ae18c6f68e05dfa730daa216b335dfe1439d0d4 SHA512 504cdfe989e8555032027223e545c5114a751e65bb7d31154c4ad6d9727f1609de7d66b4c511444cd0d759f844a15ee126646a09403102931f672fad5a9b1340
+EBUILD gentoo-sources-5.10.128.ebuild 742 BLAKE2B 24427c09689e5ef8e14c1eddc4a38dd9538221f2a9284e736da271667fe7dfabea725800e9401591906578a0f47ae6f9f85e067c47e0c64b1015bc04d0923128 SHA512 166d903f07230c7c7b2287c1b01a6f93332ea2f4ab2bd87cdc2a7d9f09cd92898603367a12b79c60d8f4478ac486a0ef4790a81dbe4ce4469c574c8b6503400a
 EBUILD gentoo-sources-5.10.129.ebuild 749 BLAKE2B f8c3ce5ad3771bdabc7b92e74e2a35b6aa0beaf9d9f6c9be13c858653607b623f3287ee6ce0fda82ec1e7f93e534af1d76158f2722da4d71cf21fcb02d922129 SHA512 26a733d2e3c4d3583c91caaef4dba26b878fb2364b404d5a4b3e011ac4f7743d176c696d36e452cbb96f10cd4a9228f9857d3daa140a148171d0ae9b41090f36
 EBUILD gentoo-sources-5.15.41.ebuild 740 BLAKE2B e82c9b0af90aa114710aa0e1fe2a8e2a8608cd7e49c7db3180202d4932a39588be99e2545155923ce6e1f32f6fe449d6bdd96738075c4d0a1aa67e0e705b8617 SHA512 68dc21f72e24288be05f648257d89d2b66b28412085608a44d9373e6318da73c1e96cee8005af65e68033f6a1b18e59ff4456e700b17bbaa2c643226ff24e986
 EBUILD gentoo-sources-5.15.47.ebuild 748 BLAKE2B 115201fd478581fc48408f012c8953a735c4e487a3cfe6652f3f3a73ce2b461dddeac3658da7f0886386223e95d6156317f8f34fe1ffe8e095d726176018cce2 SHA512 b7b1bd6f8f83ccc0fa34e319f695b5a97d4592616b45c48efd31235dc794ee9b287c81a96d4124446a03adf7c8d30ba8cbb598375d4d510b2343b5cf8974442c
@@ -202,7 +202,7 @@ EBUILD gentoo-sources-5.15.48.ebuild 748 BLAKE2B ab937be31176e89cbe2f594d3ce954f
 EBUILD gentoo-sources-5.15.49.ebuild 748 BLAKE2B d943c99bb2ddf087f534f93fe94f724c32dd733973091a6d639c559ed0dbd434c28a3cb2f59c98c770d5b9609a55c6a0e7402a5d5fdc04a4d9425139757ffe33 SHA512 b4fe0c10d3006abeae0efe46de87f35503856251c18389e2527a62d7538e9b2dce06a1705ed782d7e63882fc7cd51d6478a2b331671555fd622df2b3d1cada25
 EBUILD gentoo-sources-5.15.50.ebuild 748 BLAKE2B fd7b7364d112d46fb09005febbaed90111d88f1477d10204f87b84388dd50ee385a25199e694f114d84f5ba5a8d785df71f672b755e249fc51e377e37e6a0b86 SHA512 055044be936e8ae26340ccb91dd62e049213b466ead54a10a2d8b4e19b63a7c92ddacfaeffc4b849538b844a72ca5270499c18d202eaececa1d11ff24f4136c2
 EBUILD gentoo-sources-5.15.51.ebuild 748 BLAKE2B 0011235955d7b0b496ee4882edbe6964e1eb6d578224ac32fe69321386d373e1211b91ad28d829e013760c54d9f9efa9e98e22b6070f565aeb5c0a66101d7a24 SHA512 0157620c50d2a6dfd401b5d9282736852e536aa4900f02315d62b62dd77d0540d5ca0418ff4aaf6c9f387dc1ad5d3f24707f11646e815140cf6918dfd6aa1bbf
-EBUILD gentoo-sources-5.15.52.ebuild 748 BLAKE2B 88f9244b1f549982a9c6a3a5dd24ca0291e76e93a58da7fde8537cd33210b51ca20e2dc25763a119ab81af88cdd8791f0a59d4826c6ebf822589acfc5cb1f09b SHA512 8822fe5c812be62a286f928e5a1614e2f88da8efc2fd99753454f4c3a2379d1f7de731d2144528fb18606159b36866c0618d0b6de64cf9e2d1cfb8c063484aeb
+EBUILD gentoo-sources-5.15.52.ebuild 741 BLAKE2B f0807bb2c48707668b147d0478dcb519b706283fb6c4e720bfc43148f3957a0007ced878593ff6a694df4389904539cd42c1328c9786b9fce24edd0c514ebd0a SHA512 d9fa36c265693a77d20a22009621785328078674f87173a831333f1c4519073a01233d9922eaf79737958e36d5b1f370a0fb4b2c877c3ebea018d1b4afa5d09f
 EBUILD gentoo-sources-5.15.53.ebuild 748 BLAKE2B 8741ba0a4d822d557c334683408c67bc00067c7c9bb6a1b5db7c80c2a1bbdfb5773046a899da346e8b7dc8f4d225abd32b9b8393ca4510a38502860566026252 SHA512 456df5470f80e81f1c6c3352bddaadf4a2b13e15ed74439465ebbb42acca9f5d3ff1c7da1935b15c5aa4b0ac1bdecf590f65bc1d4df582c60fa27fdff7faba67
 EBUILD gentoo-sources-5.17.14.ebuild 742 BLAKE2B 12997100b81fee9c1bc6a048d189f68b66a312046e7d7daf590f6db6bf31edc774a5e882cab430cac09c49fac8b0b4c3396bb712d7c8b22e275528ea4f9dfee5 SHA512 3bba7236c8c24e2b135ddec3ec7e4b8098c9325332ff82930a898a4081aeb2a68f4d3f68095fde6ed9be44ae46b646845a73b3a9357caf49cfe6cc5d443ac2a6
 EBUILD gentoo-sources-5.17.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
@@ -220,6 +220,6 @@ EBUILD gentoo-sources-5.4.199.ebuild 742 BLAKE2B a3c868ca2a7cd75161e4549765abacc
 EBUILD gentoo-sources-5.4.200.ebuild 742 BLAKE2B 2cec11d404b1dfe27f2b8511f2222fc8993ae9bbb3a0833fc303d2a7dcabf9a2204f7750c9c9d5f2f1f63e7f76e209a67d0c4500ea02df2ca783f06eca1c6124 SHA512 e65fd5fbe86da2402750ae3af850bf9be6710e7c128bd456cb6bc9be1c2a38c4ef475d768a74255c42a036a972076a1d77984b08b7eae87f04054f8c0a3c59d9
 EBUILD gentoo-sources-5.4.201.ebuild 742 BLAKE2B 402922ef30df714bd68e8b2d0c419dd596a10ac5b1208d6dcb97afc4bf2ef0f5bf4ccc932d3e791c8fa84e18913f1c9b5b6e55289e012dd04cfcb8556bbd10a7 SHA512 4898d8229f3a8844c52629a91e91bb505baa1b64b53fdc36d790649b7de0ce9da1148a2012fbead1ba69cf235b944e879eaad7205b751ce82f17ee434ca3db7e
 EBUILD gentoo-sources-5.4.202.ebuild 742 BLAKE2B 10708aba18cb6fbf67640d80fc0cf568a175c769733839ea43a89f4e40697ec7c752c07d93d430e87230491cd36e2e91ec1eaecda3bceeb1c0887b48bcac3b79 SHA512 b8bf2d4a2b9ae58729fafab56661e9aa06aab067e805ea8c28700043b3aa79884065d6637206aaa42fe799fd11d1da428e1c5668bc5cad95763090cddd461318
-EBUILD gentoo-sources-5.4.203.ebuild 742 BLAKE2B a938040a3da3331c60b5b2b7633b8fcaf4565a8a96b4fb938292bf5a87ecac649169ec43aa556325d073ee5569e86657714cf51cf9d01acb5ae344738ea267f2 SHA512 d92a1f9c630335abf93966efb698e79498b63aefe2321ef678ec55246ccbb49b0126dc73123aaa6df5bc1096130d96f87e5e646ec3fdc754d924205c7f5bd00d
+EBUILD gentoo-sources-5.4.203.ebuild 735 BLAKE2B e5c80c672c24f56773e209717e53d70cca3e06956a698e53faaa720b5582266cb98ea3c449f50a6e195325770308d5cea37cc4fd75150be3a1f4781a8e81377b SHA512 c569b36f3a3c722113355b307dc89ea86b1284507c7f152136bbc2fd37aff1cd8ec30f3ae2a8b59b4f773c51ca5d113dc8a9a91362bf6b45750d4de384710539
 EBUILD gentoo-sources-5.4.204.ebuild 742 BLAKE2B c1901b9bca3aea2e66a1c297f944513912c73ba0fe53bb978c7c165d247153ccf9edfcc4fec1fd38c7f2b77e72feae595bd802a6cb90addad5303760682123ec SHA512 8a3671c0bc59b64ad979088397a0243ca687cff145a03dffa612b57f26ea2657cddc3dd756b44609cd45485ba179c8cad20fc3e0a4e3f3e32c40bfa0e828428a
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
index 89a0f1ecf810..323ff59ac0da 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
index 70e794f6fb5b..19e131e6bb2a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
index 0954e09010ab..e95ab7e852ed 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild
index 9162d1fc9b30..8e2df44128ee 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.128.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild
index 87608931a934..9313e7cdf000 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.52.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
index f451eee0308e..54ae6ca1bbe5 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index 45275d8d7070..fb12670c9b5e 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,3 +1,3 @@
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-EBUILD linux-docs-5.15.33.ebuild 978 BLAKE2B e297735107dc77e41255a24e179a8e70c44971f665a9c991009a1c4d06fc80e31bfed60cadf30501a7102e4ba059217418d1597d65d2e8a049e477aa1a1e3b77 SHA512 e9e9c857a0d633087cf48b9695b0142fdbf03198a8b62f8b3cdc1febc362b21cda808409498f1cd8fe5be58b939a0e8f45b749ea13fa167ff6073a067c5fb814
+EBUILD linux-docs-5.15.53.ebuild 989 BLAKE2B ac3cce6485b63a8c44044d94eb775707d045e4081659c5eabf537495f6af7fc88445039d106528759102c8d5eb9095476ee6be6be70fd50040e6385ffdf15ee1 SHA512 cba9d89e2a1a8c965464f933cd5215404b507a7d6431dab7e82fd5103632448ede3dd7d7a24e3e37de62d0b9f4c493dd52e0fff2fa6cffe9b96c7d39c7721481
 MISC metadata.xml 219 BLAKE2B 99596733d1861998d5b90023ad2e31e0d9f6ae4def18bcd7238d393007f97263aee3113b4e39d9e0f3c1d32675ea7c1a0b3aba61bd4b0105a23601a3544e2e2d SHA512 74ec2dcbd88d75c0785ac4cbfff8b0ce83f8d4e7f87e37c41e0e0e563103ff535093343bbf2589cc632b9bc66a4363c4fb9d0344d40409360d03df44ef889b6b
diff --git a/sys-kernel/linux-docs/linux-docs-5.15.33.ebuild b/sys-kernel/linux-docs/linux-docs-5.15.53.ebuild
similarity index 91%
rename from sys-kernel/linux-docs/linux-docs-5.15.33.ebuild
rename to sys-kernel/linux-docs/linux-docs-5.15.53.ebuild
index 3693ce4a8c2c..d3b98d3f984a 100644
--- a/sys-kernel/linux-docs/linux-docs-5.15.33.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-5.15.53.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
 inherit linux-info python-any-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~
 IUSE="graphviz"
 
 DEPEND=""
-RDEPEND="graphviz? ( media-gfx/graphviz )"
+RDEPEND="graphviz? ( >=media-gfx/graphviz-5.0.0 )"
 BDEPEND="${PYTHON_DEPS}
 	dev-python/sphinx
 	dev-python/sphinx_rtd_theme
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index e957916a79c2..8654c6435933 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20210629.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
 DIST linux-firmware-20210716.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
 DIST linux-firmware-20210818.tar.xz 172748332 BLAKE2B faf2ad6754bb72e3838aa21d5f2bc2ba49b98966a66fec04ecc5e0e2669fbbd4830820239290e12d2327f361df9084e350668befb8babfc517a5d06d2916dce9 SHA512 ce8d80794476a07740e2a0c62bf5b9a88d392e27285ba490813bf52c4b2b17cf26f24f43bc56673b8f7a11d7b204263ba9e0e8702ff8bf0a79f8478e0eb8efdc
 DIST linux-firmware-20210919.tar.xz 177975728 BLAKE2B 00e756cf15fa84fc079207de3563215b8c233f08013ecd0f530c680d15650f59e69b4af432774e44669bfd322d180b06dd60fdad9abd6df7827b07a9a400fc55 SHA512 ce500c459aca70a1c47eed6e36d145ec53f0f96c3d794524d9fea4d57494fdc33af47181489e2514ad2e1996070eef809088dfaa2508da3a6b67cb986c551e8b
@@ -9,7 +8,7 @@ DIST linux-firmware-20220310.tar.xz 237571732 BLAKE2B 9246d4fcdca0a9514606eb7b4e
 DIST linux-firmware-20220411.tar.xz 237957584 BLAKE2B 441699abac0a7554c96324e40676218401febe9ea2a11ff9ab9f9ea4945b4c590c10c9a353aa8c5c66325b408ab9ebcb57fa77b520066f1d9995cb5989bc5b75 SHA512 5470701872ed4670962d3ccb4fd046c1f00145d69e942d76b21ccce08077ca4db867bbb31b87668e6298e130f28fc522a6ff4d66927fbfcee44042e1d908f71d
 DIST linux-firmware-20220509.tar.xz 253717320 BLAKE2B 0181e209a05c3acbdcdc175868dca0ae2993effac0b265335f502a03d3a38cc4849366bb229ade87621426e99112f520f4d50444e438572c61cfc2c6d01ed6a6 SHA512 17d48222a0029d0540a7071b541653a42d66676c4dde88b7c148249450cfcb09087318cb4558ca7a0a7583f3bf0b00948d9383073e038c4f76bc4e807c757c2a
 DIST linux-firmware-20220610.tar.xz 252543088 BLAKE2B b3f627fe150f76c9a1c7b70bf691587554808275debd56e9d36fd0eff63b7ab2351ba03dd298066b03db7f2e590d7f130677e158ade587fbfb59a9efd8f83c0c SHA512 76176af2bf1e83d91c88289623364bc5d3e45d96c8586bd5c064535ee245d133283d2176d142492139cfbd41ca6ad195522c662d923b6cc76556c8509638ad0d
-EBUILD linux-firmware-20210629.ebuild 9828 BLAKE2B d812585f022d6f09455f76a07576e51137cb8d721e9cfc397447f1104fbd39bdb33a5782b7001432fdebc3149d56876943796809b8a3826d5dd6ca6fa399ff78 SHA512 4b4952579581fb52210d76b7400ff306e542df93b3cab389ef07fd1d22b51e40adf05528b93c6eeb2652f78eadde9a3dfcc7df796c43da5592a24258517fe021
+DIST linux-firmware-20220708.tar.xz 242130176 BLAKE2B 7dce1bf1e13c1c59dd0de8485301cc011e8d73ee55d5dfcf9554ebe13c53870d3d6c2b7b8a79984ea0ea0eb8683bdd589c49e7824081c985bb951753431ee35b SHA512 cc3454ba9a26fac8ce87a08f5fef74a586e81ba3225bac53c702749fb6606cea829cea51d6cf55e0cb2fcfb28b2350d60998fe7782cba00d6eb5b26204f57e37
 EBUILD linux-firmware-20210716.ebuild 9828 BLAKE2B d812585f022d6f09455f76a07576e51137cb8d721e9cfc397447f1104fbd39bdb33a5782b7001432fdebc3149d56876943796809b8a3826d5dd6ca6fa399ff78 SHA512 4b4952579581fb52210d76b7400ff306e542df93b3cab389ef07fd1d22b51e40adf05528b93c6eeb2652f78eadde9a3dfcc7df796c43da5592a24258517fe021
 EBUILD linux-firmware-20210818.ebuild 9787 BLAKE2B d07bd4551b5e9035357c635ff6a27b289b429dc10a152e31a1435a90cbfaeacc33f14ed69cb00f729db6ff080c0cb73698777b62a15afc0ecdc46c2a52d9c854 SHA512 5840a5f7df126d335a90f3ad4b44f92017b281e1790938f7c06008eadff64689c8e87928939f94a0bd9caf6be15b0a3b933d3dad02a4070fcffff25a3c38db02
 EBUILD linux-firmware-20210919.ebuild 9787 BLAKE2B d07bd4551b5e9035357c635ff6a27b289b429dc10a152e31a1435a90cbfaeacc33f14ed69cb00f729db6ff080c0cb73698777b62a15afc0ecdc46c2a52d9c854 SHA512 5840a5f7df126d335a90f3ad4b44f92017b281e1790938f7c06008eadff64689c8e87928939f94a0bd9caf6be15b0a3b933d3dad02a4070fcffff25a3c38db02
@@ -20,5 +19,6 @@ EBUILD linux-firmware-20220310.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a
 EBUILD linux-firmware-20220411.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220509.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f688b57812885caa991dd595ee2d8025606e00296c54dd399f425849076dac32ad8b233e10a4628f3f82417d0474b57b4edd SHA512 9644a17ebf0052b572cc72ff0a1b2055bcc537bf97d59427be32fc9a6234a9334510dda16b811f5af7d7c51b91baaa3cd64dd7b9a0ded0323d0d96498da6ee96
 EBUILD linux-firmware-20220610.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f688b57812885caa991dd595ee2d8025606e00296c54dd399f425849076dac32ad8b233e10a4628f3f82417d0474b57b4edd SHA512 9644a17ebf0052b572cc72ff0a1b2055bcc537bf97d59427be32fc9a6234a9334510dda16b811f5af7d7c51b91baaa3cd64dd7b9a0ded0323d0d96498da6ee96
+EBUILD linux-firmware-20220708.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e3d102f28b9531281f0d4cbfe5229ec051384ed383eb977922a0e31b8783daace3b5176a22c4f00df4d70bc9799d8dbbe6ea SHA512 22ddcc5a34c7cc6789adbed9b6556ec67218a19cd8c9ed1f806d5013e609e956cc4f8162beb2e8ffd01021da99889be4920c5fc9a4b0b9a82dd5a040988ca726
 EBUILD linux-firmware-99999999.ebuild 9691 BLAKE2B c9076729135f91fd4491b6df406da45837f071e3ab7f2ee475a2770d87e7929adefb87927c5133934b20b7ac8abf5675531180dc99a5d30f44ea71697e0e837e SHA512 8c04303e8b8add3c798cbac06ebff4a0048c1d75ae1e81b341c158d363755dfd036c39c8fbeab3e18e167a544be7826a175c70997b183b9970bc921db4b13664
 MISC metadata.xml 970 BLAKE2B b775ae0bf7cecb73829acb649595bb15c0cf95dd696b02223023ed97d42b57fa2ecc3523d678ff1dbafd27b3d71d1f27f5661adc0dfe07a416563b523682c776 SHA512 649289c0e622b28d31598524ecb48470d274a6835f6c2de00de95b114038e2d5d0f42354aaf1948da55e51060a9b3a87c8bb30f5a7b2124e373818de4e945860
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210629.ebuild b/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
similarity index 97%
rename from sys-kernel/linux-firmware/linux-firmware-20210629.ebuild
rename to sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
index 5fe7281c68b5..f4b705f99cb1 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20210629.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220708.ebuild
@@ -6,7 +6,7 @@ inherit mount-boot savedconfig
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
-MY_COMMIT="d79c26779d459063b8052b7fe0a48bce4e08d0d9"
+MY_COMMIT=""
 
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -187,14 +187,12 @@ src_prepare() {
 
 	# blacklist of images with unknown license
 	local unknown_license=(
-		atmsar11.fw
 		korg/k1212.dsp
 		ess/maestro3_assp_kernel.fw
 		ess/maestro3_assp_minisrc.fw
 		yamaha/ds1_ctrl.fw
 		yamaha/ds1_dsp.fw
 		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
 		ttusb-budget/dspbootcode.bin
 		emi62/bitstream.fw
 		emi62/loader.fw
@@ -206,7 +204,6 @@ src_prepare() {
 		mts_mt9234zba.fw
 		whiteheat.fw
 		whiteheat_loader.fw
-		intelliport2.bin
 		cpia2/stv0672_vp4.bin
 		vicam/firmware.fw
 		edgeport/boot.fw
@@ -226,7 +223,6 @@ src_prepare() {
 		adaptec/starfire_tx.bin
 		yam/1200.bin
 		yam/9600.bin
-		3com/3C359.bin
 		ositech/Xilinx7OD.bin
 		qlogic/isp1000.bin
 		myricom/lanai.bin
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9f9d63eb4b81..b948218e5f71 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index e1c368f39fa0..fbfe3546f7b2 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
-EBUILD libelf-2.ebuild 397 BLAKE2B 7ac26c8a33689a7dca2fd93df491796c6e5931542a1d345bdba98a0c4fd09d0ccc366df8419d468ea2562cf110160c3187ef261ca74da1d3f6229fc1f480c962 SHA512 d21df3673a0023a6bb2b41c9f03664b9c41336fe3402c23810e4b039c10f517a48d4548f92fcb4bfe71cd5151a81e0bfdeba75038ab709a6d456a2c673f869bd
-EBUILD libelf-3.ebuild 399 BLAKE2B 356b1ea67432a19a69a9eb0116dac16cf1dd443a1963f85fe0389817860c5d60bab4169bcfb5e6ad3fbfb7ecc45ebfc1e3dcead05985f7ae2165902747c062be SHA512 91dac88b8f8ba9953233471b0f9cb1d3f141bbe8957ebf4b4ac34fb61288b573edd70f779ce70db5d60d910b6f9f351ba3b85ba35af4bf716e2875c8a3ec50da
+EBUILD libelf-2-r1.ebuild 397 BLAKE2B 0f5f92e83e45fcda3b85123fc64c5787c2ce68b77687cc24b34856d29c668175dcfc89e195e106c51d59e43d9f5dc611adc6380417cbbd2c9b6bde042ab176a6 SHA512 5d2726520d6092a868009df6af87cf2c2e287930f7179029fbf3fa2b646c5c7bf77a10af63fa5661551f1c29c8bca99893e80bfa2ad19432e37d171c4fb7521b
+EBUILD libelf-3-r1.ebuild 399 BLAKE2B 5c5731ed476b5c0e8e0464c8b818afe9364c8d104c586bedc06a3cd2bbc5af74a28540bc0ada1b507e153a7055c242a455b4f5dbac26f4967711b807130bd799 SHA512 7450acea945f646924765286489dd46f5dea4e6dc166af2f5bfa066f20b1b717cb98d6f59fba2a2272f1cc9460d746238c3af538f3e3262a905ead77abaf8a07
 MISC metadata.xml 277 BLAKE2B 424c3611f6f418785b1dafe230de60c8e2ef3ae41cbdeaf9e037b7ff279f2e86728f000c9ddb27794814293b7845a3e563c02ee635918cf133338c06c9d473b6 SHA512 0119efd75b63b2d10e30cea58f04e6fb7434691cb3a78801d8922c73b3fed4ff2b642d14bae37f7805457e95ae092d49712147bf4b339a3b268656ca15d7a23a
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2-r1.ebuild
similarity index 88%
rename from virtual/libelf/libelf-2.ebuild
rename to virtual/libelf/libelf-2-r1.ebuild
index 165ad0fa2bb0..644892ce4f82 100644
--- a/virtual/libelf/libelf-2.ebuild
+++ b/virtual/libelf/libelf-2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit multilib-build
 
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3-r1.ebuild
similarity index 98%
rename from virtual/libelf/libelf-3.ebuild
rename to virtual/libelf/libelf-3-r1.ebuild
index 431493d0acd8..c1ec5f6ba871 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-build
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 66088cf786b4..c45cddce9f99 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index a77e12d0e7a3..e5162e5f99d1 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,7 @@
 DIST element-v1.10.14.tar.gz 17539241 BLAKE2B 37095170ebfb50c2cc70268d8d342aa60a64e7bc1e319b839208e5e2c450a757eb4f6235354427b91e48c4070b9f802a63f75fc3e502bfce8f051d902709f24c SHA512 6b849f26054568f183cfe4ce12c3729b37771f3e1c7dac9f3a22d22671cd47598b4b53f90d6e9009862e2f239411e183d94b2a56ef9422a140719910ee8dfc15
 DIST element-v1.10.15.tar.gz 17538557 BLAKE2B 3087cd7245e84ee55fdd45b041f6b36c6cc057a0db60f98bc444b07c3a8123219039fcd5c4dbe42244804c50a6c6c0246ba3561c3813dfc042f5a97ea377162e SHA512 73d2571c11b6830e67b6a20fc1f75f92f8bec289828a260a9eb0ef57eed8fbe2a2cae89233ca03fb35804e2df7f10a2345d8fc954105962f3ab61dd4bf55d79e
+DIST element-v1.11.0.tar.gz 17131153 BLAKE2B 59685357871de8778a0e84d57938476e22bd1757d7abcea718b044a2edd1bf41e22494c8e416c3c48c3277a4c3ce109d5d38c209e0a47c53f6abb584bb4b5fea SHA512 8cdfaef81e825d6849bd6371fb167d2178a091f4c5b7fa1787464dd3b979b2b4402fb327e52d9c46244fc02172878c5ad1ae954c32f0c491c11a5f9822a456d7
 EBUILD element-1.10.14.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
 EBUILD element-1.10.15.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+EBUILD element-1.11.0.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.11.0.ebuild b/www-apps/element/element-1.11.0.ebuild
new file mode 100644
index 000000000000..bdccc2ddf91f
--- /dev/null
+++ b/www-apps/element/element-1.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 82072ff586a8..49b041cd1d13 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +1,9 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.37.3.tar.gz 51513011 BLAKE2B 5d30d582e1efbc93ea65ac9bfc7a338f04fcd568cf30e58d0eca1c601c2d45261ad75cdad9d9d726e2b2c63f5a2d7ef01e26cfbbf0c77a3d110c98d06312f991 SHA512 5c5e406a3ecf83136bb46606b4dd7288b99959a17b37c3b0b74426f47fee8b9b14f3b5106f99d41c07e4924b78bcc3cc61e0058ceb98a087d3ba5ab5a51402e3
+DIST mediawiki-1.37.4.tar.gz 51545350 BLAKE2B 67fa368fcdee1ca6b6a1d8bb565e392746516d76f6934c88540ea9dd7973296601fb922a0e00e7a0a6669078fd66c766ff7b9e3001f562e2a4082de2dc91d2ce SHA512 b92d954a3bc7d4b202ae8f43e95b8111a388fe8af4991fab468196bda035bccfd67700f873c081e922e19d17881a15d00ab44f06d60f4d78019b85c6761cab26
 DIST mediawiki-1.38.2.tar.gz 54983049 BLAKE2B d1b0c5fc1e63d94c1e6830ff128a7b781928fb0ebf3d0823cdb28672412750c168b37b73c9c5efd0dec248a96a25d97fd9fd211a71237dfef0985fbb54d89e1a SHA512 0b548f3eff5eff01a4a33ee18347861a81481d45fcaf3252f9a07fc4f5423a6c9c18a11d6f014d8afc59d0f13650940af81c95b4d9e094310944b5717b7a6072
 EBUILD mediawiki-1.37.3.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
+EBUILD mediawiki-1.37.4.ebuild 2570 BLAKE2B 898b5ac318f24872b3d6dcc59ac9a83ea08b6c0631005275d64c2ff480156cac6b001b720489cb8fa3d929fbf911c1c448a21734f6ef49f871314f044c13fa14 SHA512 5578a2030404c76d0962926b67e20df106f56674c0349dab982a3b76e9d9f361dbd8e482bd2db1b48cefa74ff72ce70214dbb6ba0a8d1a8b51aa2385f2aca89c
 EBUILD mediawiki-1.38.2.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
 MISC metadata.xml 270 BLAKE2B 9041e12c102c98e539b1d69a8b47a683f7f2fd2e5c1d9b0d8ceb4af9b7abc98d56cd64f4ed335717cffe7acef253748f7798997b8edab1c73d4b4f8eb75528c5 SHA512 fbdd6fdd911b687eaa654d7a9cc25c469c68de3d582d29c142acb5f3944be4ca8205345b94841b831f1b25f604c97bdbeab2bc10bd1cc6a371f651297b56f692
diff --git a/www-apps/mediawiki/mediawiki-1.37.4.ebuild b/www-apps/mediawiki/mediawiki-1.37.4.ebuild
new file mode 100644
index 000000000000..933e06932521
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.37.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index 647852665b05..5160f47d26de 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -2,8 +2,10 @@ DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
 EBUILD nanoc-cli-4.12.3.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 EBUILD nanoc-cli-4.12.5.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 EBUILD nanoc-cli-4.12.6.ebuild 2043 BLAKE2B 1885ff99301bde74b7fc5c7819e59ab8fa584d7275e11f731029c603c9c795ba1175aa3ba353fa73960567331fd5e3ab81aae5faa9ded36c2a54a01b0ac31c67 SHA512 2406ffaaa872e8846f48720db03521132eb2f90892c1af67e5060dde5a5a6d59aec3c8cbfb360ba7b4e3439b1a60233d6e40feaca0bf288ed6f96f8eb8120890
+EBUILD nanoc-cli-4.12.7.ebuild 2036 BLAKE2B be05e190d692090ece34dd814414da563bd739f9eeb8ea2e806dfdf2176fea165d8927cc27b0b4aa542b71585aff395c69078809c9884314471b621c23407f88 SHA512 bef20f2c36b78aacd787f2f9c2be1601ed5c10da733260dc1388043cfcbca8c9a4071c7c7814a90395ca9468e3843817a100f9a79f7029d02667f591cbe520fe
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild
new file mode 100644
index 000000000000..60b0b6fc39b2
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+	>=dev-ruby/cri-2.15:0
+	>=dev-ruby/diff-lcs-1.3:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid error handler specs failing due to different (rubygems?)
+	# output, meta_spec is affected by this.
+	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+	# Avoid test requiring a network interface
+	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests requiring an additional dependency on nanoc-live
+	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 6dc4fefb2fdf..0eda336a8537 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -3,8 +3,10 @@ DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19
 DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-core-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-core-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
 EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
 EBUILD nanoc-core-4.12.6.ebuild 1948 BLAKE2B 2c4dbfba45b230a1b5c4178e8c568cdc6e0fe6d77b0f43438ded6fdbf88806ef66d179737751ce7bb9d6e33ed742697a0662ce490272b4fd10f901b52cd7b638 SHA512 208d52ca383c3cedf47272243c7855bd0dd111d705c4a554d088eb0bdf532fe38bd666706b298fc2b527f2ec7b577828afd8bb8f693e6d31881fa6a0f0cb3d59
+EBUILD nanoc-core-4.12.7.ebuild 1959 BLAKE2B 4a4df5d441b8f38c5d3e30acf4fde7e983d92f86f5ebc50b00fc397e6b9e881660ba15a26c2522bdb8a301683e588805f60c4b9ee382b3715b017bbe235b8f49 SHA512 f4ca1e068c3b5082f94104bfd0ee30be240d7a139431b69599cf693fdfe1e998757c8324a28f47f7a58a0e97c5581bb1772eddd7f3372174a5e2b9ed571a4e8f
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild
new file mode 100644
index 000000000000..f3f122387474
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/memo_wise-1.5:1
+	dev-ruby/psych:0
+	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+	# Avoid circular dependency on www-apps/nanoc
+	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+	rm -f spec/nanoc/core_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 7f6b706f4c28..e269e1b18f29 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -2,8 +2,10 @@ DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
 EBUILD nanoc-4.12.3.ebuild 2526 BLAKE2B 7d4e688c97a6128c88998e58cea369c2c477758abf1e14c46e181784789ba7aecee6e73f46eed152dad0b874193cc0f614d0ef037d12a82f14b062efd1ec10ea SHA512 01ef7a2360d5911ea712c5cb6ad037f322803669de85495c5bb18fbaad00f5b8957f6105b7e8a80d5b4705092bf1f3bf2ead1ce9c18dd1186fd14f74a8959a59
 EBUILD nanoc-4.12.5.ebuild 2534 BLAKE2B b050122de47295ece8340b901d0c5659af8d21fb8ca1c8c82e7177de75817ac0dbbae5b44531ce48719439e96e9b44442757961381464171102b071a95bfae42 SHA512 6254cd60fd6c6cdf4bc50e2f46540f7cd61d699f3f50012a0081320f1463899d9ce24765d1775238febdae83388a9e0198273b9c375ebd7a0658111880b556e1
 EBUILD nanoc-4.12.6.ebuild 2556 BLAKE2B a7fdfdc2dcf4363155c13a07cad0c1d2330d4847b209aa39f353eadf086321cc42e92abf2490ce2d95e31d2f39b757163a0119d04ba78a49ae87cecab09a6b95 SHA512 37d42b65c527a777c7877d730b1d84cbdd94d150f695863493d3f098624570236342744c727cc211ccebf3b06c604df76420ce852b38120e07aa5e481c090039
+EBUILD nanoc-4.12.7.ebuild 2549 BLAKE2B f911f259343b6ba211b8ee31d1e413b22f74035f3de3381e9848c371bd9f6e3824680bec2be814d6455ce9414115180ae8ca5f221ef3b373597643240165d596 SHA512 0fe78098357653d9458d81af5a7608646f7829fe55e708d1a90462b7cadff9fb70124d1e710ad52f5e2c19b892ccc74571c836db968bdb397d4e7d314392b677
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.12.7.ebuild b/www-apps/nanoc/nanoc-4.12.7.ebuild
new file mode 100644
index 000000000000..32ef4db37598
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/colored-1.2:0
+	>=www-apps/nanoc-checking-1.0.2:1
+	~www-apps/nanoc-cli-${PV}
+	~www-apps/nanoc-core-${PV}
+	www-apps/nanoc-deploying:1
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/haml
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/mustache
+	dev-ruby/pry
+	dev-ruby/rdoc
+	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests requiring a network connection or make assumptions
+	# about the local network environment.
+	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8ff6a6070cca..d60fbad622ef 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index ba906c28ca10..06a49ab9f458 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1,6 @@
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
 DIST epiphany-42.2.tar.xz 6101892 BLAKE2B 81553836de2518b2aa490c34b238afe7dd71f63e5f9604ff98ada6663ad37d5a0457f5345574b776582c9ad7a728c0d221360af19cebc0157810757c8d09620b SHA512 3b7bcd9225f06caca547e8d822818e7d9b5a178028cd97b17b8e2474fec7337c4d6b4d718b3cf014784939d0b2f36e84305d6e9115521fdf762af178e5fc07d3
+DIST epiphany-42.3.tar.xz 6106824 BLAKE2B 97dc47e0df026210c8c81966ae02a2916d6a738b291261894b3c3bc9a21073e547de1dab00a64e378fb049eec6fbbb15346eb7489f6100f79ab2a4e3309f3366 SHA512 3bdbbbf97e80fcd55780312b9ee5c631e0a9ce8cfb27c4cb202cc5db56579d4aeb098781c4853464f9c22faacdaf75a960b10d8b878139ad24c42728529a4364
 EBUILD epiphany-42.2.ebuild 1939 BLAKE2B d190df9f7eae141ad1d96540a0796c24eb7ac5878c8f2a33ada4f794b3c3a1d925f26581998932e55d9f5e6bfc93686f593b9dc6a8253f128908e5670528f94a SHA512 ca7e3d82176e3957a57b1707aba92295c411cc4f76e282473d23fbcee8f7e99ea9ee103c45d51952fbcf307c7470858d00fe77c3a13051cf29ff1d3179057508
+EBUILD epiphany-42.3.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-42.3.ebuild b/www-client/epiphany/epiphany-42.3.ebuild
new file mode 100644
index 000000000000..cdecea5a8e9f
--- /dev/null
+++ b/www-client/epiphany/epiphany-42.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.67.4:2
+	>=x11-libs/gtk+-3.24.0:3
+	>=dev-libs/nettle-3.4:=
+	>=net-libs/webkit-gtk-2.33.2:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.6
+	app-arch/libarchive:=
+	>=dev-libs/libdazzle-3.37.1
+	>=gui-libs/libhandy-1.5.0:1=
+	>=app-crypt/libsecret-0.19
+	>=net-libs/libsoup-2.48.0:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-db/sqlite-3.22:3
+	dev-libs/gmp:0=
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# appstream-glib needed for appdata.xml gettext translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
+	"${FILESDIR}"/var-tmp-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Dlibportal=disabled
+		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
+		# is commented out upstream anyway
+		-Dnetwork_tests=disabled
+		-Dtech_preview=false
+		$(meson_feature test unit_tests)
+		-Dsoup2=enabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
+		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
+		ewarn "Various image galleries/managers may be broken."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5eb172cfe52b..50a78640c4a4 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d9ebd009a182..339cf677e6d5 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,10 +3,7 @@ AUX apache-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
-DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-EBUILD apache-2.4.53-r1.ebuild 8183 BLAKE2B 098308fd838491fd6acd75f55e65bc38ba863e8b18793590f5986b05f769063c4cb9cf2958b8e959185990807260efd7d50b1e0914030747d3322c399f4c277a SHA512 ec50ca3a6b6496b0865b347a18daa3b477d4b5705bd53b774ea6d62405b343ff0e52e49d744157af383bd5329435e2bb68f381211f4684b1ef53327955b5a6f9
-EBUILD apache-2.4.53.ebuild 8100 BLAKE2B 2b26c13985d9884bc12a4fc1037bc35c7a1696952520bc145df4ba95766e8ff7bba840c9cb34ff8aedc3ef906152a976fc30f342555d71e0a2403f2ea73d76a0 SHA512 9e0ac55a3e3e8528bd773a0c2e3b613c724189c486498460afa236b6c3034ac3460e2a0efbe83872328360b3c1b00b944e69694fcaeb2ee987d45b60bf62bd2d
-EBUILD apache-2.4.54-r1.ebuild 8253 BLAKE2B 16a5626cd45bff1416a65a4c9ff6aff7466e76dbbc9b568182c440f6e60637cab0f3a589774103e5b1091c08bd0ba942c5ba6a984956f68746125f5588f9c737 SHA512 c910ca58b28a1dec94c88abf5c5027193f4957a40e4b9b9a271eadcc544a7a59286f6f07949f9a6704b596b868d67918225a4cbc9989c72e507bd0541defe8d5
-EBUILD apache-2.4.54.ebuild 8176 BLAKE2B c28fac88808e9d561b3be6ea867d0416e0ca690a2cb0c2adb313b10a74f5b5da5d1916d15a649b17f0d8b0f45b3eea7b424998ea48a02725a5e22811cb639bf7 SHA512 5b51a9089f19bb21ba85727108690785bf1664bd812f613bd993319aea509d72065999dc69e997f63268ed0ce98e3808a48e5c9466762e865d902674be7f05b6
+EBUILD apache-2.4.54-r2.ebuild 7923 BLAKE2B 41b3e091d8b06f114aa9ccae5861b56a8d4b99f1a7077d8701fa9a31ccd76e266ab71aa7346789f78106590ab66e4ef92bd12c7b205da1e0216d38e14629d704 SHA512 e442300b4f4aa87045abecc13d4bbca90df27c75591e5d43a30df4135cdc2da2f4f756f6301f8d90a6556c5034e39c0cc1cefda7d4767029f9384b2c3ad9a02a
+EBUILD apache-2.4.54-r3.ebuild 8000 BLAKE2B 6c314bfffd06f463fb7920a7db83268a8709eb87bfe5fe11682d24de3ea7973538dd5b44e840a2cedd28971dc0abe57d03706dbb4b2d928d6ea25bc2d4d3d535 SHA512 9d1505706847510270b4a63b10b5ac90b8c61c626a7566a5d13f2bde18224c7784fe817cd0d2c90769c162011aaa91d40713a382b89b3a21384fd30df6504f99
 MISC metadata.xml 901 BLAKE2B 126de8b6d9c924dc1bfedecc23b0ea5b5b3881b13cda7dd35d1ba04c30dabef619b2a57ac83e65695ce5e6e51b0f17c69cf752d6505c0d146dca8e2b7d90cbc6 SHA512 453b98f9ee9af6ebfc11d55e2218d1877a5a3f45fd969f6b3708f97216776c41deb651116826b15d744ea54fdd283497bc4f14917a9b00ae8b6e7af126441263
diff --git a/www-servers/apache/apache-2.4.53-r1.ebuild b/www-servers/apache/apache-2.4.53-r1.ebuild
deleted file mode 100644
index 2268b410b14b..000000000000
--- a/www-servers/apache/apache-2.4.53-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
-socache_shmcb speling status substitute systemd unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_hcheck:proxy
-	proxy_hcheck:watchdog
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_uwsgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_hcheck:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	systemd:SYSTEMD
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler ; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Downgrading to pre-GLEP 81 user for now."
-	ewarn "See bug #802495 and bug #803500 for more information."
-	ewarn ""
-	ewarn "You will need to run the following command to unlock the user:"
-	ewarn "usermod -e '' -U apache 2>/dev/null"
-	echo
-
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [[ ! ${lbset} ]] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.53.ebuild b/www-servers/apache/apache-2.4.53.ebuild
deleted file mode 100644
index ef771ff7c95e..000000000000
--- a/www-servers/apache/apache-2.4.53.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
-socache_shmcb speling status substitute systemd unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_uwsgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	systemd:SYSTEMD
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler ; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Downgrading to pre-GLEP 81 user for now."
-	ewarn "See bug #802495 and bug #803500 for more information."
-	ewarn ""
-	ewarn "You will need to run the following command to unlock the user:"
-	ewarn "usermod -e '' -U apache 2>/dev/null"
-	echo
-
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [[ ! ${lbset} ]] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.54.ebuild b/www-servers/apache/apache-2.4.54-r2.ebuild
similarity index 96%
rename from www-servers/apache/apache-2.4.54.ebuild
rename to www-servers/apache/apache-2.4.54-r2.ebuild
index 3af3cea15036..c28b47066744 100644
--- a/www-servers/apache/apache-2.4.54.ebuild
+++ b/www-servers/apache/apache-2.4.54-r2.ebuild
@@ -211,14 +211,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	ewarn "Downgrading to pre-GLEP 81 user for now."
-	ewarn "See bug #802495 and bug #803500 for more information."
-	ewarn ""
-	ewarn "You will need to run the following command to unlock the user:"
-	ewarn "usermod -e '' -U apache 2>/dev/null"
-	echo
-
 	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
 
 	tmpfiles_process apache.conf #662544
diff --git a/www-servers/apache/apache-2.4.54-r1.ebuild b/www-servers/apache/apache-2.4.54-r3.ebuild
similarity index 96%
rename from www-servers/apache/apache-2.4.54-r1.ebuild
rename to www-servers/apache/apache-2.4.54-r3.ebuild
index 1b3ba9f9ea6f..a2b75c48a3c1 100644
--- a/www-servers/apache/apache-2.4.54-r1.ebuild
+++ b/www-servers/apache/apache-2.4.54-r3.ebuild
@@ -215,14 +215,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	ewarn "Downgrading to pre-GLEP 81 user for now."
-	ewarn "See bug #802495 and bug #803500 for more information."
-	ewarn ""
-	ewarn "You will need to run the following command to unlock the user:"
-	ewarn "usermod -e '' -U apache 2>/dev/null"
-	echo
-
 	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
 
 	tmpfiles_process apache.conf #662544
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index db145a70b92f..31ad9d1bc2d1 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,5 +1,7 @@
 AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.26.1.tar.gz 865811 BLAKE2B eb0b62e48a8d0f9199dfe77a2d6ec90a06ac24f83b362ae16fde83eea53e03923127be7b24da47a83cf51fc4ebe7930cba9a3ee7550a5243f242cc4bfba3a3b9 SHA512 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec
+DIST nginx-unit-1.27.0.tar.gz 871783 BLAKE2B 12fe08d5992bec6f1034f40b310f7cece74fd5c2211598f32eca35b0c79963e20e4eddc03604cce71340e5105895e42eb3748e1f923adb2f98a642cf0345ce41 SHA512 2f34ceccc966bffb790e3149f02c3769f6a41e6bb3cbaf4c5a9bcc512d9f1baf919e13b6d87fa29885561a449f72afd32b771206aa5d71daff9604bdbd7725a6
 EBUILD nginx-unit-1.26.1.ebuild 2039 BLAKE2B 9be21599b03a00bae312d974d01a3454eb197382ff3877e9f54c1d4c309e9e2f3601fd0cfd9633a2f0d4a82b1f8cedc87305c0f412d18093ca2be8d77e8a8792 SHA512 fb394c14106950166678c07bc615aaca76066d37790308265626a553b9492d74ccb4e2b9083e57bdcae73b6d02847cde0d0b8f91008f6e849aaa2607b961bf60
-MISC metadata.xml 781 BLAKE2B fb6e50498ed8c5d97653b02b544162666934a188a3cdce03f73edf4150304cd0777d6d216c31c8071ccb324906af662c717431e3b3554808e1655b411a26fdec SHA512 db5c97d9cdb3d78c2a69112e38e35cc0498b0319352aed87a1a0d0eb018801303021cb262fdac92d0aa7570f310e7cc3942f386e78fa47b265b9803039181fc2
+EBUILD nginx-unit-1.27.0.ebuild 2085 BLAKE2B 2c1b7564775ea6decb669001fc36f147dfef38a5ca72e78ec3be7a5fd004e549ff4c2b57326db61e4a7bbc23797918022840fc239e945e3324ba6e1c56f9709a SHA512 b4b2a2f21ea4ca43910fb231afe766ce234b05fe7cd840e7a23235736c8147728f848f1c7f40f6eff3a9d978254437e6a5a51e0196854666a623ecf9b2eda49d
+MISC metadata.xml 879 BLAKE2B dc106dc27a9308416d5d2c95ecfdcf1ed9fc0975cb4aded845f40bbd20e27e3e07742191cc42193a9063f2347d17a6eda7a76239dc49619058414c1993b487cc SHA512 159a0aa1d20d5eda346236b5961e51a74b77ea93b1c20ce1213fe51ffe476bd9e5ced1edf0dfef6cd408c1b6924a0aad3476dd24dbf1bd0e75abb59e6517c1b3
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index 321aeb2afe3a..75eae13eaaaa 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -15,6 +15,8 @@
 	<use>
 		<flag name="php7-3">Support for PHP 7.3</flag>
 		<flag name="php7-4">Support for PHP 7.4</flag>
+		<flag name="php8-0">Support for PHP 7.4</flag>
+		<flag name="php8-1">Support for PHP 7.4</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nginx/unit</remote-id>
diff --git a/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild
new file mode 100644
index 000000000000..c72136b53615
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.27.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-4 php8-0 php8-1 "
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	php8-0? ( dev-lang/php:8.0[embed] )
+	php8-1? ( dev-lang/php:8.1[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 38ce686fc9b0..ad3f81f3aa63 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -10,13 +10,6 @@ AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440
 AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
 AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-DIST nginx-1.20.1.tar.gz 1061461 BLAKE2B ed359db6486fd2152e0246663b8d8f4fc6980594945212545d301ce6ce16088c760d11b26fa1f6e9c392b9464103c570ddccc4343f5ab3f84ede011bb7a6458d SHA512 3d9fd4bf2740eaf20fcc3c77260a3556aaf9dff2879afc2dbb5fff364dea27313ffbc51d335e9fc9c0186a2a44dac055ef60fde0d411b8cf842fdf661478c961
-DIST nginx-1.20.2.tar.gz 1062124 BLAKE2B dc2fb9e7316ccac433c1f06c59d2738358c16194fe0ece80f54d145e2c4e3c3a8d6ebc4badb97580a000d721197a865bcc8c94a4d671af94be4bc3181974c586 SHA512 8b65e881ea4ac6162cbf32e5e95cf47a6d5418819f8763ca4a781cffa38187dd7886d4bc195d000a7046111a27121ff25800f8645405174995247e6738b4279a
-DIST nginx-1.21.0.tar.gz 1063682 BLAKE2B 3c29a8832e879677ff6df198aa420bbe546322a9d8b000827fdfbeb7e3519374cafd5a75910880f5ae07e78f0096952498c8515be788cf62916e3470d93c66d1 SHA512 1f0c790e5ba104278ef5fc357e60ba2fddd2d8abda1363e26b418324b050f0e9f4901ce23949adede699e9f1340e8480ad8a6c811b7420a74c8f5c101be8a7ad
-DIST nginx-1.21.1.tar.gz 1064925 BLAKE2B ff5dfb4a07d0dd3c8dd10e2545659cc25e15db71109c39ddb315f2949b0ec033ffa6df226f9f882e605bbac0b19a57f85eade41060c3317c9f07231ef496dcea SHA512 4fee94e9981abf4506cc3a24053828e81c763e98a3704b1cc54944cf09b49269a04495aca154b2dc6e065551d60f3f9f219659e93056b67952ecf8d07f9fcd98
-DIST nginx-1.21.2.tar.gz 1066678 BLAKE2B 7af3a6f4cfc84c98058cb5ef3e0991b4f3cc2d8d9ca3b84111c30eac158253ac7f444e5b6ac9fd3a296f03a6c906e8a411b02c54e8df199f67a9ee0acce683d4 SHA512 5fa9c8f3a1bd9366b30de2bdbbd5baef47381e6d8672341ed601116baeb077ea1b596716ca06ec03d8a2773a437b78acd408084e49ba239f74de915f1b7fb8a5
-DIST nginx-1.21.3.tar.gz 1066609 BLAKE2B 424e9525f8f27dad6a49e7ec7c76160331ce98015d1023c71e9c60146aef7d330c780dc69bf2db01da0bedce3acecb156b3e108c24d2683ffee2954396ff440e SHA512 173d6d5c1471df1f5fbcf43fab19699ac509faee44a6c603f5e96ba59ac58774bbd84be5b45f5922a12b4037e4b32f875ce71c28e3e6adb70f306a2d25b40736
-DIST nginx-1.21.4.tar.gz 1070260 BLAKE2B 61297386c59b4c29ec120f963e76fb7570a262304a0401381b0b2fbd2fa0ce9b3392c552d6c70eeda88b45553cca39bb5ccb42cce7f23a45c57745c366907b68 SHA512 8f0be700bbec70abdb9902c27044334038087d03bdf07b9bdf1520f416edd12ca504bdd0244b34c542b222c28d5bd2d0add54dcb04b235e763d088fa3e2cee6e
 DIST nginx-1.21.6.tar.gz 1073364 BLAKE2B 815d035df33bd947eec41a2f5c993d1f179aa0bd4d069280916aa089a2f96fd3bada7a7192b4a0ef7b8f43036f3a2def0e93d8c8f720dd7145a5d55ea058652f SHA512 10b0cdd13b26687104bf11e6b850fd851e9d8881bdf67f72c062d956e661da4d70482e6ec3123405b324ad7ed821a8bcc67b742dce9f59e972407fa437ddcad4
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
@@ -40,16 +33,6 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
-DIST njs-0.6.0.tar.gz 528419 BLAKE2B 7b3c9dd4be8182298cc283e8b19eb4efeef66416d26332ae73dde66b5b67ad980c3e07f12fe0006dfb9710f3df449ac2598bfd1803f6c86d721f48697d975087 SHA512 fa569623fd594e859c535c75041be443ef6329a4ee33d9e0f29eeb56e69ae2f3c44264ccba736b4a97ab0b33700f381acb65a884889d6f644f3fbce7c1bc586e
-DIST njs-0.6.1.tar.gz 529124 BLAKE2B a24b6542dcef6599d18b86d38dbaeb554beeddb5c100f5bfb97c87c81bd66842afc6f77f23ef2c542ba32da96d5c2f999d3c869fa8d76d919a4f964020d19e30 SHA512 996cdc11d65af5e3d5b3a8f28087868c40409a062e6e1ed3eac8e516cb60b13f88a945c86bea5dde1bc089fe5f96f3ba351d87dbfd513f7140ea4ce98119959f
-DIST njs-0.6.2.tar.gz 538303 BLAKE2B 6c505a6ec20222095d4d10efdf274d2ea2fa61f236ceae71311f2c47dacc4b21f6af2a7b6f8bde21db6453455aff2994341c420fa14722120a98ac9d8bd6e934 SHA512 0c359501665ca303fcfb29353d4ad6ed398679b10906a6bbe6f6f6f69418f08adce9849a50206fdbd4e8fa89a5b73ea4fa43f1f02a28b7bd02e3f990d11263d0
 DIST njs-0.7.2.tar.gz 584483 BLAKE2B 98f28e599f73aaacf2c155dd2a630b8dec9767725e47e6d93de05fb15b854277cd2fcc38ec915d8b04a769d40513725fe2061054521fed73967a6d61f04ce8e1 SHA512 7ff9c8f4e8cf1a3aeb0f2ed9f37e2b3f4966812966d1aca17dae8b454dd7fa725ccdc631b7dc1f3434f588e589f4cd419b9e087f3c745cd6ca092a683c92d82f
-EBUILD nginx-1.20.1-r3.ebuild 40183 BLAKE2B d2bd2c0891f9321472913606c79996124fb32ca157a1914a80ddc5da44029991270513d2274ba4c7f6164571fbca8269b8c240f6d6d6399d04154730f9002460 SHA512 fe8ed22c68031e1f579ab09503ef2871a8db08f1cc57e6b9c5a976b610ffe435e27f727140ab2cccb6dcdb598fcf7fa5c88509d60c59ab3192504139dfef7219
-EBUILD nginx-1.20.2-r1.ebuild 40187 BLAKE2B 3e494a43c8147040592a4ee4eff4e4c1fc07ca2c9c49a2947c143bfcb9fb5e6008db5f0dbc435244196dbb084b1ef8e23246a227b50f2ae1a3bbf52341f73f0c SHA512 9b50c49cba770b60f03232ab1fba7e778ff3e733b26e658762bbd4686b0a13fbfa2b04db9e15b6a98fac7d13011cb3e9fca33b9e53dffda257b771b31c8c7a80
-EBUILD nginx-1.21.0-r3.ebuild 40187 BLAKE2B 89d5c0ec3c469deed922b944df7129d5c690fa03aa9cb5717636705f913a4aaf41490e0581e5aaf1f45e67c2e57efd212045b1864cb4f78f93c30f6eb12ed70d SHA512 3f3eaf217e52cb6cbac24d22b9fa638c6f7c04db2c3352205ad70f2a91a7334c5aaac02e046caa8ad0dbf72bbcce67decfe212ce64e6850c7305a2b4c65c6cdd
-EBUILD nginx-1.21.1-r1.ebuild 40194 BLAKE2B 43ea0a93dc3008a6694bf43076a807105ad6349cf8ea35df11f38772bbcd064ec2860fc2dbd797af457fcee41493121d761b9a3b864977c9438882a86c542c4e SHA512 0d5a55125cd4be44d8e40c77cd642664f7d4c7edf7649ae49959021b1027d6705017570d9a5f3be200435b911452a555b6709c1797ba8638211708d1a60803dc
-EBUILD nginx-1.21.2-r1.ebuild 40194 BLAKE2B aeabc99cbcdbe96d8e43a406398a8752c958962cc149f3c8fe6d99ffd016b20ff6b57ec5c51496a8d911510f562b310a46c4d5004312de94c8d632f96c0d9fbc SHA512 7e33279a9f02316294a01f1cf905174c72b1421b012a8cc27ebedcc6e350f1130f05851e47463258c51a22cdb7881abb816d4bf272ece2893e17a6a217e15fd6
-EBUILD nginx-1.21.3-r1.ebuild 40194 BLAKE2B aeabc99cbcdbe96d8e43a406398a8752c958962cc149f3c8fe6d99ffd016b20ff6b57ec5c51496a8d911510f562b310a46c4d5004312de94c8d632f96c0d9fbc SHA512 7e33279a9f02316294a01f1cf905174c72b1421b012a8cc27ebedcc6e350f1130f05851e47463258c51a22cdb7881abb816d4bf272ece2893e17a6a217e15fd6
-EBUILD nginx-1.21.4-r1.ebuild 40194 BLAKE2B aeabc99cbcdbe96d8e43a406398a8752c958962cc149f3c8fe6d99ffd016b20ff6b57ec5c51496a8d911510f562b310a46c4d5004312de94c8d632f96c0d9fbc SHA512 7e33279a9f02316294a01f1cf905174c72b1421b012a8cc27ebedcc6e350f1130f05851e47463258c51a22cdb7881abb816d4bf272ece2893e17a6a217e15fd6
-EBUILD nginx-1.21.6-r1.ebuild 40190 BLAKE2B 069209137a21239848549dccf8c686992e3165fe9eed2d1c903f7cd77912ba5793b2fbd1e7b019d219a4e0a959fdd84bcf7c0b7341b74fba14ace2267183a75d SHA512 08ef8f34ff9cc1cdec5861a0298df6dca7459d55558178858034226c8062194179fb174a44ae11ad761b7a31802a98e6c897d60e5e60c6629f0c3857403119af
+EBUILD nginx-1.21.6-r2.ebuild 40087 BLAKE2B 112bb88ef710b36d6f742c4e530a9a7874c62e367cbe37c3cc5821a18871f3a0fd95c4ab341c81a6ca6e7058de487f00248eceb18731cf1d3a9ead827849a086 SHA512 9efb2473b925368ff022cc27a145d3fa9ec637bfc030aca3c765fd8359c92f1ac2a89e6490dcda601cfca5b1c0e5386d4e885c0ddef15b7297a930f200980362
 MISC metadata.xml 957 BLAKE2B 082956c543d3bea969b687777c9aeda28771529c533bef4f1022aba2a7ff028c17fb9f0225838c7dc5469195d4d5f390fa86f729eede9dbca486035c9d76bdc8 SHA512 d2db106dafc55c0853e57616f830fb26fa26622a3b9cc7348a6dfb7c90c92e48bbbe6e4a87becd3b34dec1cfd60ac4ee1f923a828d0a48a8d4f24603f21cb250
diff --git a/www-servers/nginx/nginx-1.20.1-r3.ebuild b/www-servers/nginx/nginx-1.20.1-r3.ebuild
deleted file mode 100644
index 9152592128f8..000000000000
--- a/www-servers/nginx/nginx-1.20.1-r3.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.0"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.20.2-r1.ebuild b/www-servers/nginx/nginx-1.20.2-r1.ebuild
deleted file mode 100644
index 8330adb84690..000000000000
--- a/www-servers/nginx/nginx-1.20.2-r1.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.2"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.0-r3.ebuild b/www-servers/nginx/nginx-1.21.0-r3.ebuild
deleted file mode 100644
index 81d8ec42dad6..000000000000
--- a/www-servers/nginx/nginx-1.21.0-r3.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.0"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.1-r1.ebuild b/www-servers/nginx/nginx-1.21.1-r1.ebuild
deleted file mode 100644
index 731c9cd0e306..000000000000
--- a/www-servers/nginx/nginx-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.1"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.2-r1.ebuild b/www-servers/nginx/nginx-1.21.2-r1.ebuild
deleted file mode 100644
index 9a5530c82907..000000000000
--- a/www-servers/nginx/nginx-1.21.2-r1.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.2"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.3-r1.ebuild b/www-servers/nginx/nginx-1.21.3-r1.ebuild
deleted file mode 100644
index 9a5530c82907..000000000000
--- a/www-servers/nginx/nginx-1.21.3-r1.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.2"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.4-r1.ebuild b/www-servers/nginx/nginx-1.21.4-r1.ebuild
deleted file mode 100644
index 9a5530c82907..000000000000
--- a/www-servers/nginx/nginx-1.21.4-r1.ebuild
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.15"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.6.2"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.21.6-r1.ebuild b/www-servers/nginx/nginx-1.21.6-r2.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.21.6-r1.ebuild
rename to www-servers/nginx/nginx-1.21.6-r2.ebuild
index cbd512501efa..d85839846c7f 100644
--- a/www-servers/nginx/nginx-1.21.6-r1.ebuild
+++ b/www-servers/nginx/nginx-1.21.6-r2.ebuild
@@ -166,7 +166,7 @@ NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd multilib pax-utils
+inherit autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 HOMEPAGE="https://nginx.org"
@@ -279,6 +279,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
 	virtual/libcrypt:=
 	pcre? ( dev-libs/libpcre:= )
 	pcre-jit? ( dev-libs/libpcre:=[jit] )
@@ -343,11 +345,6 @@ pkg_setup() {
 	NGINX_HOME="/var/lib/nginx"
 	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
 
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
 	if use libatomic; then
 		ewarn "GCC 4.1+ features built-in atomic operations."
 		ewarn "Using libatomic_ops is only needed if using"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7f17aad910ad..b99fc53fbc8a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -19,10 +19,10 @@ DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b48
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
 EBUILD tomcat-10.0.21.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
-EBUILD tomcat-10.0.22.ebuild 6259 BLAKE2B 98aafd111b5567ed267889bef4752a77837046621215aac65425868370d22198502c2398b8633d056345529d9a488bfcb1ffd8cb02667ae9c411f1b4b888a58b SHA512 b6202ca76aea59086cc906ca4af6df31dc907e6239f9684d737b979f7e158deec7e9e24c4d33dd2c145bc6b2c60b5ec01e9288aa4c71db95c64e768f7814fa6b
+EBUILD tomcat-10.0.22.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
 EBUILD tomcat-7.0.109-r1.ebuild 4151 BLAKE2B 2dd58aae5be3d975b4cee4852a61e97d670f7b312d0e8f6dad1f6faaaab617c1d1270f7d574b2c740432fd34818aa618c04fb488b38b29493e9ae7336a6c7fba SHA512 8f92e1f5f08be910962366c1b812b5f0386c983137fc41e20d812232ca156a2daa9062c89ad00ce093f583c67953efa3d70d24b002d814db8298e8d03827fbf3
 EBUILD tomcat-8.5.79.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
-EBUILD tomcat-8.5.81.ebuild 4750 BLAKE2B a35a7ab335879705ba77fc18d1d90d07d2438073a3efa75dbccd7a5a54cb93aa53d6618b63d99f3c1c959ed0ceddc738257034aa1ccb002e686a836f65e87aac SHA512 b78bd351be7d5f111827f46e23447372eac320b3af8891106658002f44cded4c7ad404a8ff221120e5b777d29beb02d292d71503af7f1e7dfd6c0684d49f9226
+EBUILD tomcat-8.5.81.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
 EBUILD tomcat-9.0.63.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
-EBUILD tomcat-9.0.64.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
+EBUILD tomcat-9.0.64.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
 MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/tomcat-10.0.22.ebuild b/www-servers/tomcat/tomcat-10.0.22.ebuild
index 17405e3e5eda..eedd06361adf 100644
--- a/www-servers/tomcat/tomcat-10.0.22.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.22.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.81.ebuild b/www-servers/tomcat/tomcat-8.5.81.ebuild
index d0fb542639ea..4c41325ba986 100644
--- a/www-servers/tomcat/tomcat-8.5.81.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.81.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.64.ebuild b/www-servers/tomcat/tomcat-9.0.64.ebuild
index e151500fc704..816509c99633 100644
--- a/www-servers/tomcat/tomcat-9.0.64.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.64.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 9b25f0bc742e..81ee6549cfb0 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 64f8531defe3..92234b9d7585 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
 DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
+DIST libdrm-2.4.112.tar.xz 451872 BLAKE2B a41cbd714e169edd8c6bc6bba5cec8a7a703f553665575c35f43909e2927ed3c1652ddba25b98e63974f0734ca26e818e6ee75613159eb68ea85ba45934df393 SHA512 df8a207d9cce220ee2cf67877eda65394733fbfd0ff85fdbadb2b20ba9bacc41421b32452506c8caecddaf8361564ca68cd6c74d4faf3b1569ab30a3243e4340
 EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
+EBUILD libdrm-2.4.112.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
 EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
 MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.112.ebuild b/x11-libs/libdrm/libdrm-2.4.112.ebuild
new file mode 100644
index 000000000000..a8ccddd22d1b
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.112.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{8..11} )
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		$(meson_use video_cards_amdgpu amdgpu)
+		$(meson_use video_cards_exynos exynos)
+		$(meson_use video_cards_freedreno freedreno)
+		$(meson_use video_cards_intel intel)
+		$(meson_use video_cards_nouveau nouveau)
+		$(meson_use video_cards_omap omap)
+		$(meson_use video_cards_radeon radeon)
+		$(meson_use video_cards_tegra tegra)
+		$(meson_use video_cards_vc4 vc4)
+		$(meson_use video_cards_vivante etnaviv)
+		$(meson_use video_cards_vmware vmwgfx)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b52b479fcfc8..6ec61044f7f8 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,8 +7,8 @@ DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
 DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac
 DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
-EBUILD wxGTK-3.0.4-r2.ebuild 3607 BLAKE2B 83963b67bbfb51328ac4c2713620a043b73f761218d2815e9c3c40e351ffeec67136ffd878406ebcef7901a90a42d53772070a4ad3baa9b31ba01f2ed4c8bdc8 SHA512 b28ca15b70efd4893a9e3c238bb9c8dc470a6266ff0c813668f26103804aa07cec1aee4508536f9f0ac79c1eab037ffa4f11f2ba1aaf11b51ab1c971f0b73f36
+EBUILD wxGTK-3.0.4-r3.ebuild 3533 BLAKE2B 50e1a0c8e924bdd7ca33ce04b4801ba307126b2222417fbce268410716cfeab830cd5efe15bdb8b61c4f5e89e0eb84ce819323d776a87d2d7d5577cca404b5c7 SHA512 8eecb7934630c5990f92cccc60cfbc3397ad130cbe308a1f3d8adf54c2c7a2fbddcf1a65a27104e04b6e65027b9e5aaeec000767d9439ed667436c3afb7e5edf
 EBUILD wxGTK-3.0.4-r302.ebuild 4824 BLAKE2B bc5a1a4266fe8dad373ed7efc86ed6b4df84e119047146b2aceb2ddd085399184ff38b9bdf7adf1b1543f907db56d210a271e67d8ba025331802d453ae603207 SHA512 9d3c39b3a9c5350eb75f35822898f29f1e7941bb449ec8e1221edfd75a4c51bfd4649128163827c3ba76b1c23eba03444e00e45f519d4929fc6b417897d7e6bf
 EBUILD wxGTK-3.0.4-r303.ebuild 4970 BLAKE2B e0494ec1cf4ea602048cc4d344efe7fc55f17dc9d35845f1629700e155c0483d47f04f5b908a3fa1e269a55390a356c2d2697924fb72edf5742f4c0525fe403d SHA512 9e4fb18d9f6aa3f5123a9e988fe9957845779961764e29360e76909559f14ff8a4bcd6d022a9ba38a074c26c5707a72c78993e9323decd97bdbbd94fa5a5ef0b
-EBUILD wxGTK-3.0.5.1.ebuild 4993 BLAKE2B bfb39a462ee34ebcc9780442b3944157616156a258ab828ad5685483f252b64d8a581c3cf4836af595cf9e6dddce34caeb4c4eebd23f787a3f3705d7f23ac8b1 SHA512 bd751e7eda8694009c53b1297365823316cc4791be00a84ce2a45fe3ad2225912a2950b168dcea9bfe31c146161543af18218b788d457c9e71cfe9164dff8ed6
+EBUILD wxGTK-3.0.5.1.ebuild 4992 BLAKE2B 9a854f361c2969dae991050de21a4086ca28d63e9c0c9f6d5bc3c6a05929f299fe4e70515c2521d9fbf5887b30ede38c363854cc820a44930656b7cc4bc452f3 SHA512 9867d2a4a2a5a2fad1bfddde166ceb092619eccef75d31194add4373efddff88ac7addfdfd19b8fae4ec5d60f0b35be3a7e11cd4ed51bf1080dd1890cc99b619
 MISC metadata.xml 760 BLAKE2B e665c57ff50c54f0630ca7d7f78764f81d516cb93c397f6c4e90e57534d18bf54872a291c2c928b57e6b630d7a8ff7b385677de07de970490ad810983d5f61d3 SHA512 7f2e0cfc91d5622ecbe4dd94452ccb130214b68e89e400a7f9ef505f9bb28cac9bd585c1a612c45bd314a8fa0291f74cbf3c31718b1bb11cad584b80bca99d24
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
similarity index 69%
rename from x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
rename to x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
index ce1c918692a7..990923e26230 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
@@ -1,52 +1,51 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
+SRC_URI="
+	https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
+S="${WORKDIR}/wxWidgets-${PV}"
 
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
+SLOT="3.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X doc debug gstreamer libnotify opengl sdl tiff"
 
-SLOT="3.0"
-
 RDEPEND="
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+		media-libs/libpng:=[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
 		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
 		x11-libs/libSM[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 		x11-libs/pango[${MULTILIB_USEDEP}]
 		gstreamer? (
 			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
+			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		)
 		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
 		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
 		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	)"
+DEPEND="
+	${RDEPEND}
 	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
 
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
 PATCHES=(
 	"${WORKDIR}"/wxGTK-3.0.4_p20190713/
 	"${FILESDIR}"/${PN}-3.0.5-collision.patch
@@ -54,14 +53,13 @@ PATCHES=(
 )
 
 multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
+	local myconf=(
+		# X independent options
+		--with-zlib=sys
+		--with-expat=sys
+		--enable-compat28
+		$(use_with sdl)
+	)
 
 	# debug in >=2.9
 	# there is no longer separate debug libraries (gtk2ud)
@@ -70,17 +68,16 @@ multilib_src_configure() {
 	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
 	# http://docs.wxwidgets.org/3.0/overview_debugging.html
 	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
+	use debug && myconf+=( --enable-debug=max )
 
 	# wxGTK options
 	#   --enable-graphics_ctx - needed for webkit, editra
 	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
+	if use X; then
+		myconf+=(
+			--enable-gui
 			--enable-graphics_ctx
 			--with-gtkprint
-			--enable-gui
 			--with-libpng=sys
 			--with-libxpm=sys
 			--with-libjpeg=sys
@@ -89,37 +86,35 @@ multilib_src_configure() {
 			$(use_enable gstreamer mediactrl)
 			$(use_with libnotify)
 			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	# wxBase options
-	if use !X ; then
-		myconf="${myconf}
-			--disable-gui"
+			$(use_with tiff libtiff sys)
+		)
+	else
+		# wxBase options
+		myconf+=( --disable-gui )
 	fi
 
-	ECONF_SOURCE="${S}" econf ${myconf}
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install_all() {
-	cd "${S}"/docs || die
+	cd docs || die
 	dodoc changes.txt readme.txt
 	newdoc base/readme.txt base_readme.txt
 	newdoc gtk/readme.txt gtk_readme.txt
 
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
+	use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. )
 	einstalldocs
 
 	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+	rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die
 }
 
 pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
+	has_version app-eselect/eselect-wxwidgets &&
+		eselect wxwidgets update
 }
 
 pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
+	has_version app-eselect/eselect-wxwidgets &&
+		eselect wxwidgets update
 }
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
index d0931e5b03d9..ac79a9db4b3b 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
 
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 RDEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5193899fc92f..0234583c5ff1 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index a186e2e7066e..d6dbd523b749 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,6 +2,6 @@ AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd-r1 500 BLAKE2B c37a4ca616b31b2cc151cae750475178c471ce9e2f7f1a9491a93980a882bd8c1b5baaec8ee2ec211acb77e243b36d6a077a25c14aff96ce01a6a493cd88f4c8 SHA512 a3b7e055eb70c46516319cfc9c9e59038568ad646865bcd5cd953d2774c48c4989c8f2a77f644993543d56fb128fedfdc90904a3370dbf8325300932cf7e1d08
 DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
-EBUILD bumblebee-3.2.1_p20210112-r4.ebuild 2174 BLAKE2B dd6be54e3cf11824082ac77e8653449d83d222ed593ff2ba4c0f8711253a8655629a79152be3c29a687eb4880197a2fe7fad14e3b59aab7fe903013714fe2d67 SHA512 41cda744892a62394e79c7a4b413ebd021b97f941c467f4a9e84ea500f8db6578e7446d2dd389cedd4482c9cf9b260503f084c599e50a31b5f6838c8465a19ba
-EBUILD bumblebee-9999.ebuild 2176 BLAKE2B 1207d11b71af20d2c0d301d852ce487289890d93d7a5852076597c2d58ea658d8e441e0e4ef64f6d82625ee20a6ba372d9339a253ed6146544b951fdd45701b2 SHA512 8cb18a00f1880bdd472f3816451cfd252a9e088790c68baff1f9034b0486368c19839ffa119ad1a315981aa2e18b7fefda4f73fa4e6021ce5d2ccb3512ed0a55
+EBUILD bumblebee-3.2.1_p20210112-r4.ebuild 2243 BLAKE2B d4e25d1f4bbf4951d50d1bcba11c8e6ee720262bf9206ff1f57e23568df1716ebba4a32f8ade79602be1c87f8e5ec52fe193d6a1681e56df41c6d0b65bd64dc7 SHA512 ba63f6cf68d21e918c58384547ef9526773655d1a1162cb883ce6e8fd7d753003269b2afa085083bc5db2e63a734bc82b00a23f2804f2a5d9de9eb795c31ca60
+EBUILD bumblebee-9999.ebuild 2245 BLAKE2B 78ce1bec69a1c2c33b60acf0a0d21a98764291fac461282ce740a64cf9538380f6767d4e30a123f48ebe471fe23043a50008ca1e3b762fd596c94d4cd706f74f SHA512 54a5b52742ca1b5deac86a0e9f949085b8b83b94af4ab298c8199b07a3a5cf1ec33b09beaf8215806be51ce5d98fff36ca254d5a11c9bafe68ff51b252eb2c27
 MISC metadata.xml 1144 BLAKE2B 67ca15b4170a0af155067fbf73a81f91e7f182415e67fa38126d556ae47ecdb80e894b7d45dfcb9e7756cd6ed276c2c80310cd4fad9a16965a428f5c733fed43 SHA512 50f745ac6a455635f715a14b0d2ef638eb521e5820d78654bbe9ec60690c21f946cd4ee5f28285ff3ced8fb3a6f62c668e7236ed6e481538a4315430c91452f2
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
index 25bad11dfede..b0690088fc3a 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -91,3 +91,11 @@ src_install() {
 		You may need to setup your /etc/bumblebee/bumblebee.conf"
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index 4c2cecf46ce5..bd63a8594628 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -91,3 +91,11 @@ src_install() {
 		You may need to setup your /etc/bumblebee/bumblebee.conf"
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index da6524df443b..8b9d053931ac 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 30b0a130bb48..d990818f856e 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -2,5 +2,5 @@ AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r1.ebuild 575 BLAKE2B b87e4ff7307adc9a3e022ddfb3dfcb856107d75f33a4985133f1af3618664cf00aeec9bf018096f14c86771c42ac0dc56298b462b28737d4973e5f52a129518c SHA512 36d6c163872f5397c88e184ffbdfe4c9b9e86aa7e63f5f479e66d8fe9b66af2a859802f6850c6cc955ec02c9a49837cb1621857b287ff899757d87c237209520
-EBUILD gkrellm-countdown-0.1.2-r2.ebuild 660 BLAKE2B 9c6dda06ae935b993a547459a6b3a38760e0c9c55fbecf5f7941409353b4198a88a65b5db97dc047be29be83db97585b120bb7cd90a0ab0e740106ad93ba3aff SHA512 0b2b7ab84864381ba2a33bda6db5435bd57942625c95e31b7a8eb31fc957cbd5f1b58185e2028f1bf4f326ed5cee6d1aca821d0707adcd5551df340a7c01a7b6
+EBUILD gkrellm-countdown-0.1.2-r2.ebuild 661 BLAKE2B af2ebc12d5f527dd97204f806a0582c6d4d1dba5991b8fd38c502b417fae4764876818fded673aa917cb58cbc69f6ac268acaca7fd020ee061210760e21c4b29 SHA512 2c15caa6b77ecc76c86a340ac8bcccdfe9ccae867017fc3630f7f906996736300560ad48c9c6448cf650e2b02cad7547604e203816de0710198b0e8ef8388e08
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
index 29c9fb53247e..e67c4488f863 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
-BDPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-makefile.patch
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index 658c52e97709..bc05fb0d44fc 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,4 +1,4 @@
 AUX wmbio-1.02-fno-common.patch 740 BLAKE2B d53e54a24ee0a7271746632cffed02475406ce5048bf8c37d3b1b7ee0932e8c8927db8cd22aa32e7d509dbcac0e1438c2aa44cd62e48822edffe28802aef05c6 SHA512 38881970a52f20ec721ab944c43c80586a65c35f704e4103f996d6276897850754a5f912386e01c6f4c32ee48f03ca4ccef504a8c8c7fc367c4c982cab9061a7
 DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
-EBUILD wmbio-1.02.ebuild 768 BLAKE2B 67390e3a14265a6e0215fe4ea704e21cf2c347c7cf80c6acb9f9178f44b61d7888e73d0da986d92cbfe6ad6780e855444f71409c7bde0a2154937785752d7e11 SHA512 e0b3ded12d598815617f09f5a97a3aedf29b326e8bf1f83075fcdb509226e9c9805c91b1778d65144148a29e3a5272fe6f64eb879b5243d3368431dc68491378
+EBUILD wmbio-1.02.ebuild 834 BLAKE2B ea312ddbd8105bb454a40ee025e4f730e32c2f9047a4da3f519ba9663f30a8d6998ca44e0266fd84644c38cdfeb971728281eb7475dc726810afaa15daca3a18 SHA512 62289c981e8fa9c1876af7205b64bb7b5046bc40eafc963c5f497cd12309ab5b91e6e3978fcb9c8bcf32b9122527d4b4c69e7dfc34db5b90ca5cdc51281441e2
 MISC metadata.xml 604 BLAKE2B bfc37c2cedb9d900bd0e2846248b572f362c786018c7e5a67879d587510ba791804db5d04af7bd3ae87be8bc4f09764d84ff9ca7b66ba69c49dfef1ca555a18e SHA512 cefa27b984a5959d8f13454f4376c5cbdd8c2bcc6900689d64cc12e1bb0ff262bcca0bbda0c6a23b5064671b98747ecf040ec3bca105bb9df3106f2ad843b8e4
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index d2d2e7ccc5fb..4c7d53c862ea 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Window Maker applet that shows your biorhythm"
 HOMEPAGE="http://wmbio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmbio/${P}.tar.gz"
@@ -23,10 +25,14 @@ S=${WORKDIR}/${P}/src
 
 src_prepare() {
 	default
-	# Honour Gentoo CFLAGS
-	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die
-	# Honour Gentoo LDFLAGS
-	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die
+	# Honour Gentoo CFLAGS, LDFLAGS, CC
+	sed -i -e "s/-g -O2/\$(CFLAGS)/" \
+		-e "s/-o wmbio/\$(LDFLAGS) -o wmbio/" \
+		-e "s/cc /\$(CC) /" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index e5c504e9cc49..4273df1d1ee6 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -1,4 +1,5 @@
+AUX wmcdplay-1.1-cpp11.patch 1315 BLAKE2B 5ca7792045a6c64be012a1b1474bfe5722f9365e2e3c0b3ed956b30e0afd7cea99cc4a672fd0e236c5cc4d76bb4f948699e699fccb959f37dcf0cf94ca955fdb SHA512 4774a3de25ecb5de09ccf32318f6e19d98560c05a438d39bf4bbdd47b38e1a5eeea13a2f615c969eb3efd48fdc83b013d830b8b3f11518f9c12c90b0993a5437
 AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
 DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
-EBUILD wmcdplay-1.1-r1.ebuild 598 BLAKE2B 21ab0b04f3d40cc8c58c1dc706abc3a3a4d6a29c5c6698e0f34e7f2634e0dc4a42e47019623eb3b2a42ecb8afae2680560c9693c5a8fcba0b8884b210d24c961 SHA512 d1c542bfa8931ae139aa92463e03cce12c6c5d813bd7e76a57cc0c91cb821f1dce88e98e8a1dd00655422ee7d5f42e977550936e64104aae763b03629d9e1761
+EBUILD wmcdplay-1.1-r1.ebuild 639 BLAKE2B eaf576cb722ad44210fda5bf6c71bb63a158fba3ae0b40e552c1fc0876fc3fc2dee511c4ac4af6e09a476fc275280952e3032deedef450f442618eed6a20348e SHA512 bc255c8689916b6a7ef6b7853919e2891814d5ca504da37aa62dd13908807d5b4c62f777d98f907846934aa8f510fcb4a14c5db5c5dcfd81896d9cccf68fbe9d
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
new file mode 100644
index 000000000000..7fdd1021dab3
--- /dev/null
+++ b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
@@ -0,0 +1,30 @@
+From bd69f80f597ca589683d6f606e979b8f77e9e0a4 Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Wed, 29 Apr 2020 11:01:30 -0400
+Subject: [PATCH] wmcdplay: Add spaces between macro and string literals for
+ C++11
+
+We may get compile errors (e.g., [1]) otherwise.
+
+[1] https://clang.debian.net/logs/2020-02-24-9.0.1/
+    wmcdplay_1.1-2_unstable_clang9.0.1.log
+---
+ wmcdplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wmcdplay.cc b/wmcdplay.cc
+index 46ae03a..675b5dc 100644
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -353,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char *colorname2, int prop2)
+ void scanArgs(int argc, char **argv){
+    for(int i=1;i<argc;i++){
+       if(strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-help")==0 || strcmp(argv[i], "--help")==0){
+-         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease "VERSION"\n");
++         fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease " VERSION "\n");
+          fprintf(stderr, "Copyright (C) 1998  Sam Hawker <shawkie@geocities.com>\n");
+          fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n");
+          fprintf(stderr, "This software is free software, and you are welcome to redistribute it\n");
+-- 
+2.11.4.GIT
+
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
index 4751907aadbf..47fa6c9faf43 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/dockapps"
 
+PATCHES=( ${FILESDIR}/${P}-cpp11.patch )
 DOCS=( ARTWORK README )
 
 src_prepare() {
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index e90e975e8e11..8f9a881747e8 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -1,4 +1,4 @@
 AUX wmcms-0.3.5-s4t4n.patch 8562 BLAKE2B d1b99dc03a8dd0fd2f1e5d387ee8b763a0b1633199c20ab231fa8496a253f9124ad7508bd66cf742660b7aa9ddca16b5eaa887f08ddb4e8de0dd10b7cf490370 SHA512 ad25dead5271907845ae96efec52844de1005f31ddbf4d2e43996633ef8c54c89f9137421b019079462227a16052df950c7f589d112815c8b02b435f863e8b09
 DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
-EBUILD wmcms-0.3.5-r4.ebuild 710 BLAKE2B dc90bba96a414e8d91bd704f86b847b782fde93b8385e4b9557f730f365691f98c4921bf1cc54e102143a656ffd283524c3dc20f1b815b56dc5e2e2214b5ac34 SHA512 ea7f7584dbf73efd20cde1315124f0a328f3f83d2918403a203552e4bdf32114b7e64340d7a2f28d2a5f5b8189adafdbe74648af595529208fbc31079025a9b0
+EBUILD wmcms-0.3.5-r4.ebuild 752 BLAKE2B 8f13e3eaf86f6ff5ee644ff152b5d6abea58f8c2d34256b35505ea59f0632ffafb994640b3b1cf8602f9e04856cd08c1859f218981441c58d76962dc2056c168 SHA512 0790ae9be3951f636fceddb50dce8a5023ca580f6371122d159819d50f47e808eb24685e52f6df63859cf9ba4988a7155c5907674ff7f305d98e169fb2a78421
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
index 70c2fcf3f058..af360d3fe27e 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
 HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
 SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
@@ -27,7 +29,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}"
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index e31c00a69084..24384fe6b503 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
-EBUILD wmdrawer-0.10.5-r3.ebuild 1182 BLAKE2B c9c0af7bfd790d38fb15b0b64042bbf6ffb93ba91646752d77b6aa3bdca73032ee1ae97dd7f2a7305e5beb9cdcafabbf81e70f7795d90ab2322e8b85f286f045 SHA512 a3e32a02315339ef851d6e58f3ccd883d678be30a55f1a907cba2fadb2178a35778195194afaece381425862c6be6202245acce37f3685c6fea1f2a91e9ac6de
+EBUILD wmdrawer-0.10.5-r3.ebuild 1228 BLAKE2B 217e4d49d5925e100040814368e505641ba330a0c5958b29004cc3c8bc9126abfd783827ec313aa914e5a159a4c9c5f32396ad589c13dfa3aebb5ff303b6efe6 SHA512 85b04baf700cf55e72f464caf804e06cfffda66163b8bc20608e110db69513830ea01131eb3b2fe981a89e68ec1e81f1461b4476c4825a598c3a8faa5c427dbd
 MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 8ed75478b444..d72e2c0e4a88 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
@@ -33,11 +35,11 @@ src_prepare() {
 	# Do not auto-strip binaries
 	sed -i -e 's/	strip $@//' Makefile || die
 	# Honour Gentoo LDFLAGS
-	sed -i -e 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
+	sed -i -e 's/$(CC) -o/$(CC) $(GENTOO_LDFLAGS) -o/' Makefile || die
 }
 
 src_compile() {
-	emake REAL_LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 08d095f9f8e9..61d7b2f822b1 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -2,5 +2,5 @@ AUX wmgrabimage-0.72-gcc-10.patch 1009 BLAKE2B aa7be547c75400ec11afada57b8466eec
 AUX wmgrabimage-noman.patch 295 BLAKE2B cb10ee8ea0e98a2c77fe51fb333ce722efa8d0ce7b4296cdae925deae9a4ac946cc88d97e5da6805ba3385381fbd4651fd4a4b75eedac0678b6d52b6b9d59496 SHA512 adaace112266f179c120fac600d5b4eb016806ac7075f69663880c5f518e09ee213f899318b74feb2777e5504c06fdc72f4d54e733fc9f2ba9bd533490c42307
 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
 DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
-EBUILD wmgrabimage-0.72-r2.ebuild 1108 BLAKE2B b8ba771cb7d67ebe95d82a667b8319d501de210edcbfff1a9b1d1dd2f9607013ba69253f00eac2298c3b793951624f16dbd3364863190733825749a9b67d9416 SHA512 976065532662b03bb110d6479d55bca9dc6b7d6aadb90bde747b66842fcda762ce1916fda4cb3078edbe9e2ef70cef7dd79ad1c89714da73006ffa66c842fc35
+EBUILD wmgrabimage-0.72-r2.ebuild 1141 BLAKE2B 33a876c94272ca777049c36d46be69b39cec3df2f86a6f71831a84651f14c082a74215e6d55560f964375a68388f7d478edfc1c767a9768054f12cb116b47638 SHA512 7520b3315ea5b298c4435664ce0b7116a241f699fd865270e97c3e98b1a15bd05e0b66e214cc351b2e55bb73aff09217f96ca14a401cce528e558065f8ab627f
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index b1d7ff43dabc..126ad0294ba9 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 MY_PN=${PN/grabi/GrabI}
 
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_compile() {
 	emake clean
-	emake CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index f7288454ca6b..196c4394fb45 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,3 +1,3 @@
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
-EBUILD wmix-3.5.ebuild 464 BLAKE2B 9b62dfdefe3e991b5f1a22a3a917efea9a4bbd62ce2b70b7f5f892ec3b71367f4ee0da61e78553746f12a861641a8175369b59aec668f23ec50a8227df1281d5 SHA512 b0db10b4390d024a7a4fb222bd0bd3e14c3b13281950b43230279a4e4b06e9d334a4cd95c58ee4ec72b7f9c67199cc00465b04109a089f9588e83cdbdd9f408b
+EBUILD wmix-3.5.ebuild 549 BLAKE2B aa606b2c998f96dc11d1ee20ee4c8169bed0dd3ee46bb6b5c784480e5e0dc97c243d783938ebc3005ba8f863f24c6f5625724960f531c60e6249a2a35c9f7472 SHA512 f8ada5922c517e3c62f79221308c2447a50cc25c024e2f9a68c89dcb20fad7b5c169a05803d1593cf6ac2e0778e8bdfadbad8e2db9867b7637ef02a9ae02c126
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index c0b6a38e180f..c2eab904e70b 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,3 +19,8 @@ RDEPEND="media-libs/alsa-lib
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	sed -e "s/Audio;/\0AudioVideo;/" -i wmix.desktop || die
+}
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index 8058db49726a..27fb5e0bc020 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,4 +1,4 @@
-AUX wmmenu-1.3-Makefile.patch 577 BLAKE2B 67ce17eb16ee1d53fb2485a9bbc38e6ac37ce89099defd3840182e052bb1b5a47ba02e94e3a1c1296205085d6de3ea099b61dbd9fff3756020570874ee5854ee SHA512 485a6f902418076fadf157ebd07f5014bda958dcfaeff3500daac13ae3a08650e783a03b95c2726ed8bc98c3db96e7f2971e3a0bf874fed64e1e3bc4f6c5de8a
+AUX wmmenu-1.3-Makefile.patch 811 BLAKE2B e4e8481ee9b3ccca5520d5e676f89a4b1065b3d5b53243bda2680c3d199996c94c95d19e5bff7325b58b57301e1c23418784fc7c938fcf282392813b6b7ca234 SHA512 fda9df531370fabb07a25fece24670ac9791ba09394ee56284e33298c89ab0382932be06abc90387f724e9171df665ed3717580f0880a661421901a14c41efdd
 DIST wmmenu-1.3.tar.gz 33766 BLAKE2B aaed2a54781a1daa475d0757a4dd97d50e3d200dc72bcc9a7d2c833c6207a73f8f632aa66dc6746f5992edc94cfcb24a722e4dcae06496b9a811577329aeeb98 SHA512 4c8738c9a81d56e084754f4db28da6d3171475b5967ceddaa5646b3d87679112e4f272e1bee2c2a81dd072cc948b3652d843a3ddff9bc31cfac4f787b337e767
 EBUILD wmmenu-1.3-r2.ebuild 810 BLAKE2B f19a123b2a65e4c5a3e8a68c479130b97a20ddac7439855d3311c73354975438d33dabd37cc24f1a18522902e7d13d1d4a8d403209927d46a98ebe6f394e05fe SHA512 b9ee5bd8abf1d909e296843bed9d971a9ad448ab37addf8b1128bdc1ddc4153a43f1f3455ea7d88f005670b459b927ca699659469b091b4f43cb98cde835a2bf
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
index bbf18433480c..7e41b40d2f04 100644
--- a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
+++ b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
@@ -1,7 +1,12 @@
---- a/Makefile	2015-04-17 13:43:08.122972280 +0200
-+++ b/Makefile	2015-04-17 13:43:11.569975854 +0200
-@@ -14,12 +14,12 @@
- PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2015-04-17 13:36:16.000000000 +0200
++++ b/Makefile	2022-07-10 16:02:05.686255330 +0200
+@@ -11,15 +11,15 @@
+ PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
+ PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
++PIXBUF_LIB := -rdynamic -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
  endif
  
 -CC = gcc #-g
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index 203aef76ada2..5e6018366eb6 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,3 +1,3 @@
 DIST wmpager-1.2.tar.gz 24255 BLAKE2B 7ca18094ad1cb51793249072e530366cd4b4c02d8d5a2a8f49bae4e4742fbfdb6dad9a20d79142cd6776a17dfa078c6e6a7dbf84e98611f6024166f1bdf0a977 SHA512 6abd4ea28bba9bb809a8e0ce96df2b4491f32eaa39a16fa57727581c63ad6f96515e761392564af1515b92a6c463f7efee5fd84b96ae730fa0ff19094f5fec3e
-EBUILD wmpager-1.2-r2.ebuild 813 BLAKE2B 8a239d3ac459b2a89f3e5c9fcc725b47643f28f9b44260350f9cdee5f47f44776044c80017f2aa1438340d8721d7da7e783f0a445c984f7592de47eb03a0207f SHA512 67ddca8fc38f75f4b47c814af45fefbf8e039089b16a9e69e480a06b7e55b24f672747808fc517d595384cfe51f9278f5c9830dfbc6f90c87287a58e9964d231
+EBUILD wmpager-1.2-r2.ebuild 918 BLAKE2B bfcd82e73f0c5272f86cc48c5c50f39a53657fabdfc80cee3218e95978ddbe05f642a10a9610be4b840ce353e8786b0d0a7ad8273630c60972e4f644d7d8d8a0 SHA512 1a3003dd2aaacc6d5a2d6e5932afe04320b47a12019f1466bd5cd59755612179d970401afd09dc6528b97988cda3afa2ccdd98daa4b49173a58054df91e7ff55
 MISC metadata.xml 335 BLAKE2B 84ea6f161a5cf64fc1e9e42acb9f07936feab59f93f718fea55648446d52ed31a392e499729635894777433e1727d679da7761be79fd8adfe4abc4aba7a1257e SHA512 64fd9abf4714f12fee918ed90e7a6b67660a1ce73b15f341217892465ed655b2c0ada154a26f1fff87df7748d974d5f1a50846daf16f60e93ef7612fb2a247c3
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
index 920a6e876ac9..541b6e136aad 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A simple pager docklet for the WindowMaker window manager"
 HOMEPAGE="http://wmpager.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
@@ -21,12 +23,17 @@ src_prepare() {
 	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
 		src/wmpager.c || die
 
-	#Honour Gentoo CFLAGS and LDFLAGS, see bug #337604
-	sed -i -e "s/-g/${CFLAGS}/" \
+	#Honour Gentoo CC, CFLAGS and LDFLAGS, see bug #337604 and #726286
+	sed -i -e "s/-g/\${CFLAGS}/" \
 		-e "s/\${LIBS}/\${LIBS} \${LDFLAGS}/" \
+		-e "s/gcc/\$(CC)/" \
 		src/Makefile || die
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake INSTALLDIR="${ED}/usr" install
 	rm -rf "${ED}"/usr/man || die
diff --git a/x11-plugins/wmrack/Manifest b/x11-plugins/wmrack/Manifest
index ab00a77fad4b..1263025b9400 100644
--- a/x11-plugins/wmrack/Manifest
+++ b/x11-plugins/wmrack/Manifest
@@ -1,3 +1,3 @@
 DIST wmrack-1.4.tar.gz 124243 BLAKE2B a1d8581b9ebc252429abe4c04aebbe9774d8a84048511b6dc5af02b8495f9c6c50d23e3fa26dd68f31d2d155ddae28e19c37d81082ed4378d269d19fd6888ae6 SHA512 27ed399a56f7f37e494005f02e74a09ad22c448ac288a3d2123987488ce65460f4c80841e8ff0fe3ff20db156130bc9e4894b42280181a1af58e06c1f8320a1e
-EBUILD wmrack-1.4-r1.ebuild 747 BLAKE2B e35fa9926abad87571634c91f1079e9b31b78f82f18246748f9b2064a0d845c78241493200089974d61038b7369cff0d9e407c6b8b306d4fde1e0ae1243aafc6 SHA512 aec8ff2fa93fc81d3b5784f23e42a11ddf5bdc3fe14641b9445a04e95521ccfe28da847ff03fb5a20a2d5b5ca7e56f02d7daca95b4aa2a9dcc11cce49cce1980
+EBUILD wmrack-1.4-r1.ebuild 764 BLAKE2B 0718b355b3486d13ef3d42e81b4b48591478462d8498e581326afdd96a855135e958c00f96bde27915419be8588cb49b2252b10ddb93b301ccd9ecb62bf60ddc SHA512 aba841821143009d8a15d98eb50db13ad5618b8a38497ca4df45f8aa80f8553e335ac6808cae6669963bae37bdd63a8c872faad20aa5a63632081017fe4117e7
 MISC metadata.xml 329 BLAKE2B 525a644fe58ab8a6d8ce6ec753a4ced0cd8802eb1d26080d8c314ed360f55dbe9bdaee92e64bd457c5862a264c30e751b1c4a8f89558f72315836beb4fd13c56 SHA512 e78f6a0002c43bbf9a272ffd27069fc8f247b0ffec60d1575fa1128e00cba7de82bab933feea18bf86b75b9f2cfb8279b5e842a0cc4830a654f9d89024b0b653
diff --git a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
index f40d1f916205..87ecae2c815b 100644
--- a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
 
 DESCRIPTION="a sound mixer and CD player dockapp"
 HOMEPAGE="http://wmrack.sourceforge.net"
@@ -22,6 +21,7 @@ DOCS=( CHANGES README TODO )
 
 src_prepare() {
 	default
+	ln -s grey.style XPM/standart.style || die
 	sed -i \
 		-e 's:gcc:$(CC):' \
 		-e 's:$(OBJECTS) -o:$(OBJECTS) $(LDFLAGS) -o:' "${S}"/Makefile.in || die
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3df9d0b2f48e..4f7b62b233ae 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/claws-mail-themes/Manifest b/x11-themes/claws-mail-themes/Manifest
index f60696309079..0c82cb0620e6 100644
--- a/x11-themes/claws-mail-themes/Manifest
+++ b/x11-themes/claws-mail-themes/Manifest
@@ -1,3 +1,3 @@
 DIST claws-mail-themes-20140629.tar.gz 3611756 BLAKE2B e684108aff78ef7556e33cdc9d5a49e740c883bb05383fd045ecb6e091048fc3088b3f4638036a25c4c2a7d58c894e3185b04f2ba628a7e1da465bed6dd1402f SHA512 afde84c76185445f0a8ede874ee3a9b1d20cc2c390c4393aa07d1fc4aca3614d74885679cd3a296544e36d1dc8b08d623deca1616e984dc921c9ccf12f58bea9
 EBUILD claws-mail-themes-20140629.ebuild 563 BLAKE2B c893131b8d08fa7c0fdf9820de4f1954c09b1c49f3a02008fec25a693fe6bc1e8c3d663809beb71b401707b75fefdd0a2dfbc620938a58817414f4f183a8a9b6 SHA512 dbc008a2a8c82c506adcbce0fc59ec58f68a98ad0601208f8a324a556699cd48a4cf7f24642407cc8917bed6d8c99050914be7e410aa55c2291450b2fe64b12f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 259 BLAKE2B b686159b165bb65001fec330015f34ab32825ba2b95bda35f433702b2a1b687120ce9de3a181683886cbb3ec13863099e02593f009eee89b0bb1125dae93bcbd SHA512 191845ae8df52119a9934c6fd23f5b9ce8d2c77df29c750790d3ea8b6af37355b69b5b24fdeae3bffe7f5ce4f8997e7211008dd1f36e7de0ebda3a87353c0dd6
diff --git a/x11-themes/claws-mail-themes/metadata.xml b/x11-themes/claws-mail-themes/metadata.xml
index 85e4ed814fa2..ec151f29d1be 100644
--- a/x11-themes/claws-mail-themes/metadata.xml
+++ b/x11-themes/claws-mail-themes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 34b83ed97042..769cd91d44f9 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 32bbe943c5d4..189cea694d1f 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,5 +1,7 @@
 DIST thunar-4.16.11.tar.bz2 2326592 BLAKE2B 0e077f2b4bba613849d3dabaebfa652fd99cc2d1035320016fd4e87597e1af1f6330c2758feead307c6182784de65a358058e2a482f2e287447cdd05d00c8404 SHA512 41b390ce269911e4f0b83c07bf910274cf13afcd293389b156457764a0c771dcb87c03976debe0c4ce06c6a5eeca32fd043cbc3e92d4c7ea8fb00da973b06404
 DIST thunar-4.17.8.tar.bz2 2713668 BLAKE2B 96f54c6058dd58e012a69e38db4502a540806e5709f10f414091e6e9a98b2a186cecca337df702978f98fb3d2413acaa3e3d50a695e132b5416391cfd9c0260c SHA512 bae2f1453509c50e8dedd7f7570e95d0b84cf946829b29849c55f90863f29ba8eb7fa06b0aec3a4506368c24c964423d6920707d31cef4091fb700da3b62f19a
+DIST thunar-4.17.9.tar.bz2 2786205 BLAKE2B 2b497e8653fe83581fcec78959dafce3764c98564cfa36bfe26a7cdf2aa3f0b8bf7c41b5e002ca3999931c21856adec74ea2f5f3d863da89bd6e89025f5a83c1 SHA512 029d7e893cbe38d5c968dd9ac6141b52c513bcb7bb1c9a566082e51bd86f22993acf8ba65cba05d341558a06c57aa36e51dbf702044fd3ea0176a88fae158cc2
 EBUILD thunar-4.16.11.ebuild 2081 BLAKE2B a840f913d712f0fd4cf1e95ba546980ba5585f6f9a0350a0ee46b94f1bc3fec18d6e3f9910b54687e1c731ad14c5cd42bfedfb325a4fc83cd68cd4921ef81482 SHA512 706f25a2bb739e61afd279c5aa6adc9db076c06df44188c35bb4807223a4183ea52a154e1f3beb868ea9bdfc6a6b8952e8f65f161d205936ec401457db00dbe8
 EBUILD thunar-4.17.8.ebuild 2094 BLAKE2B 9dd2cf1f04bb50cbe1dd688900985bd172cdde57b9437fef0598275bd781dc8394b917101a7e19d1ccfcbffe60dac893db8838c05b5b72e8c74588fcdb76da17 SHA512 8f792518ca25313f2eda5cb8a75b5623f12d6f109b17a12975aaf0713ec3c65cc97fb26072027832784dcad5c80e729ae75aca9bcef894e73b187e5ee563479b
+EBUILD thunar-4.17.9.ebuild 2095 BLAKE2B 620eba7e06c48898f69d56c26a02ebd453a66ef5ecf145f5493bd65e697d80b9def87074192d35d3d40ee7d40d5e8955c9aabcb1d0113191cfe4e0d6fe9b9146 SHA512 7517cf241eff81ae0a943e9365cde64a1c903547d6cfcbc0d088a8d182fb22edb1f78717c1f63f968ee0a6bb9217b895299a7917b21acc1c9ee7bacd335f03e2
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.17.9.ebuild b/xfce-base/thunar/thunar-4.17.9.ebuild
new file mode 100644
index 000000000000..2f63d8467516
--- /dev/null
+++ b/xfce-base/thunar/thunar-4.17.9.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://www.xfce.org/projects/
+	https://docs.xfce.org/xfce/thunar/start
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+DEPEND="
+	>=dev-libs/glib-2.66
+	>=x11-libs/gdk-pixbuf-2.14
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/exo-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.6:=
+	>=xfce-base/libxfce4util-4.17.2:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( dev-libs/libgudev:= )
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "If you were using an older Xfce version and Thunar fails to start"
+	elog "with a message similar to:"
+	elog "  Failed to register: Timeout was reached"
+	elog "you may need to reset your xfce4 session:"
+	elog "  rm ~/.cache/sessions/xfce4-session-*"
+	elog "See https://bugs.gentoo.org/698914."
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 2af481d2673a..092f64c27bba 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-panel-4.16.4.tar.bz2 1383630 BLAKE2B e370fc286f5b035671e059e81a5c890842949c60a8aa1ae4cb06ded7f1e538d90bf633efd7e3e2b7642eb1b490a48eda3cabd1a967930cb63cd423fb5b807e22 SHA512 a1ad5a528968c4b1a5d2fb1537f7774aeeb525d7cb2f77e261b187b94e9de22f018bbd47d462ce4ad09b360126548d5848e46643df40549f9f8a3c44a4a14564
 DIST xfce4-panel-4.17.1.tar.bz2 1400182 BLAKE2B 02dc05aa6abf7a294c90aae2bfc9cd65a2ecadc78d99e7d530a96941a671b789d21b68295c34b8395e8215bacc209a3b262b7db1d44d30a1006033c73747d3bb SHA512 0070c5af1cc708ce808edc7a77171254cbf38d2e6d518d62a3eaa28223793a32bb9ad1b098a6a9c6f6f42c321ec007eac6ffd247ec0ca51a5045bf819e1471cc
+DIST xfce4-panel-4.17.2.tar.bz2 1408821 BLAKE2B db607dc1d35e746608ffe1484f2484589ae81d5d58387c8ae8c9fde9d9fdf0747f6746838290dcf1f6c9f6d1bb3efc130ec14445e6d48ac014bc114afe001f71 SHA512 a1d34d7ecdb196ba7095e613010e576daa809f0a94d48546a27731dc617a26318e7cc72204a26d9f788e744498ba58bc0f2f374260aca9bd2ad697ceddf36bbd
 EBUILD xfce4-panel-4.16.4.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
 EBUILD xfce4-panel-4.17.1.ebuild 1514 BLAKE2B 8f337f1f973ecb11069d36664168905a2ff30e9ed60bcc533220ea0eb6db4aafa382ba24205972a47f307a30f766c4356a0628c9be73f63423f35209b8f76adc SHA512 dc144ea24018d779112cdfdae2bbd917bf46fa92cde8f5f481cf75f37e105b7da2c2b1129fa75ea8335cf9c1d317f0fa317526cb856ce8a9eafef8edbee9eb7a
+EBUILD xfce4-panel-4.17.2.ebuild 1514 BLAKE2B 43335a4a947059c056c68f26b87ad94fa8e6a5220ba8d0d41cb047a082688259c09b4309bdce07f1824b5d23f891019ee6d738c390720994e0337656cc7e8072 SHA512 bfc75e2dd5b868a880d7a859bf3e66f5e2f2595e09258b8f06f8aad5d2509f88b2ae50cb0ef843d7eff3a8f8219daa9fdbd2f4638a5ad4b94bf3655f4f6397b6
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
new file mode 100644
index 000000000000..1779f20fe84f
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbusmenu introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libwnck:3
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.1:=
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.13:=
+	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable dbusmenu dbusmenu-gtk3)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}